From 869496401726d598e19643a87d82d71f72cc40e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Fri, 21 Mar 2025 10:12:26 +0100 Subject: [PATCH 01/11] Use SMTInterpol as external maven dependency (not compiling yet) --- trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF | 3 +-- trunk/source/AutomataScriptInterpreter/META-INF/MANIFEST.MF | 3 +-- trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21.target | 6 ++++++ .../BA_SiteRepository/Ultimate_E4.32_Java21_Linux.target | 1 + .../BA_SiteRepository/Ultimate_E4.32_Java21_MacOS.target | 1 + .../BA_SiteRepository/Ultimate_E4.32_Java21_Win32.target | 1 + trunk/source/BlockEncodingV2/META-INF/MANIFEST.MF | 2 +- trunk/source/BuchiAutomizer/META-INF/MANIFEST.MF | 2 +- trunk/source/BuchiProgramProduct/META-INF/MANIFEST.MF | 2 +- trunk/source/CFGConsoleOut/META-INF/MANIFEST.MF | 1 - trunk/source/ChcSmtPrinter/META-INF/MANIFEST.MF | 2 +- trunk/source/ChcSolver/META-INF/MANIFEST.MF | 2 +- trunk/source/ChcToBoogie/META-INF/MANIFEST.MF | 2 +- trunk/source/CodeCheck/META-INF/MANIFEST.MF | 2 +- trunk/source/CoreRCP/META-INF/MANIFEST.MF | 2 +- .../source/GUIGeneratedPreferencePages/META-INF/MANIFEST.MF | 1 - trunk/source/GuiRCP/META-INF/MANIFEST.MF | 2 +- trunk/source/IcfgBuilder/META-INF/MANIFEST.MF | 3 +-- trunk/source/IcfgToChc/META-INF/MANIFEST.MF | 2 +- trunk/source/IcfgTransformation/META-INF/MANIFEST.MF | 2 +- trunk/source/InvariantSynthesis/META-INF/MANIFEST.MF | 3 +-- trunk/source/LassoRanker/META-INF/MANIFEST.MF | 2 +- .../Library-AcceleratedInterpolation/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-Automata/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-BoogieAST/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-CHC/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-IcfgTransformer/META-INF/MANIFEST.MF | 2 +- .../source/Library-IcfgTransformerTest/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-LassoRanker/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-MCR/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-MSOD/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-MSODTest/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF | 3 +-- .../Library-ModelCheckerUtilsTest/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-PDR/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-Proofs/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-Sifa/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-SmtLibUtils/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-TraceCheckerUtils/META-INF/MANIFEST.MF | 3 +-- .../Library-TraceCheckerUtilsTest/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-UltimateCore/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-UltimateTest/META-INF/MANIFEST.MF | 3 +-- trunk/source/Library-srParse/META-INF/MANIFEST.MF | 2 +- trunk/source/PEAtoBoogie/META-INF/MANIFEST.MF | 3 +-- trunk/source/RCFGBuilder/META-INF/MANIFEST.MF | 3 +-- trunk/source/ReachingDefinitions/META-INF/MANIFEST.MF | 1 - trunk/source/Referee/META-INF/MANIFEST.MF | 2 -- trunk/source/ReqParser/META-INF/MANIFEST.MF | 2 +- trunk/source/ReqToTest/META-INF/MANIFEST.MF | 2 +- trunk/source/ReqToTestPowerset/META-INF/MANIFEST.MF | 2 +- trunk/source/SMTSolverBridge/META-INF/MANIFEST.MF | 3 +-- trunk/source/Sifa/META-INF/MANIFEST.MF | 2 +- trunk/source/SmtParser/META-INF/MANIFEST.MF | 3 +-- trunk/source/SpaceExParser/META-INF/MANIFEST.MF | 2 +- trunk/source/TraceAbstraction/META-INF/MANIFEST.MF | 3 +-- trunk/source/TraceAbstractionWithAFAs/META-INF/MANIFEST.MF | 3 +-- trunk/source/TreeAutomizer/META-INF/MANIFEST.MF | 2 +- .../UltimateEliminatorController/META-INF/MANIFEST.MF | 3 +-- trunk/source/WitnessPrinter/META-INF/MANIFEST.MF | 1 - 59 files changed, 59 insertions(+), 75 deletions(-) diff --git a/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF b/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF index b0acc6d06fe..090482ed10c 100644 --- a/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF +++ b/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.plugins.analysis.abstra Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.lib.smtlibutils, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, diff --git a/trunk/source/AutomataScriptInterpreter/META-INF/MANIFEST.MF b/trunk/source/AutomataScriptInterpreter/META-INF/MANIFEST.MF index ba1e33162b9..8a291e9589f 100644 --- a/trunk/source/AutomataScriptInterpreter/META-INF/MANIFEST.MF +++ b/trunk/source/AutomataScriptInterpreter/META-INF/MANIFEST.MF @@ -9,8 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.plugins.source.automatascriptparser, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.smtlibutils Bundle-ActivationPolicy: lazy diff --git a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21.target b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21.target index 0373d6993dd..c61f132e7f6 100644 --- a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21.target +++ b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21.target @@ -118,6 +118,12 @@ 2.12.2 jar + + de.uni-freiburg.informatik.ultimate + smtinterpol + 2.5-1388-ga5a4ab0c + jar + diff --git a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Linux.target b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Linux.target index 277cf954498..75b1041eded 100644 --- a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Linux.target +++ b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Linux.target @@ -205,6 +205,7 @@ + diff --git a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_MacOS.target b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_MacOS.target index 505b40a171d..fbe7d238bb9 100644 --- a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_MacOS.target +++ b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_MacOS.target @@ -205,6 +205,7 @@ + diff --git a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Win32.target b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Win32.target index 379f1d898e6..ef26dbe59bb 100644 --- a/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Win32.target +++ b/trunk/source/BA_SiteRepository/Ultimate_E4.32_Java21_Win32.target @@ -205,6 +205,7 @@ + diff --git a/trunk/source/BlockEncodingV2/META-INF/MANIFEST.MF b/trunk/source/BlockEncodingV2/META-INF/MANIFEST.MF index 7b15ab0f615..3dfad880d07 100644 --- a/trunk/source/BlockEncodingV2/META-INF/MANIFEST.MF +++ b/trunk/source/BlockEncodingV2/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.lib.icfgtransformer Export-Package: de.uni_freiburg.informatik.ultimate.plugins.blockencoding, diff --git a/trunk/source/BuchiAutomizer/META-INF/MANIFEST.MF b/trunk/source/BuchiAutomizer/META-INF/MANIFEST.MF index 9c223ac28a6..debba63792b 100644 --- a/trunk/source/BuchiAutomizer/META-INF/MANIFEST.MF +++ b/trunk/source/BuchiAutomizer/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.proofs, diff --git a/trunk/source/BuchiProgramProduct/META-INF/MANIFEST.MF b/trunk/source/BuchiProgramProduct/META-INF/MANIFEST.MF index 40fe256b94e..f28d661b4d9 100644 --- a/trunk/source/BuchiProgramProduct/META-INF/MANIFEST.MF +++ b/trunk/source/BuchiProgramProduct/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.ltl2aut, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, com.github.jhoenicke.javacup, diff --git a/trunk/source/CFGConsoleOut/META-INF/MANIFEST.MF b/trunk/source/CFGConsoleOut/META-INF/MANIFEST.MF index ca27687e531..cd5520a9aca 100644 --- a/trunk/source/CFGConsoleOut/META-INF/MANIFEST.MF +++ b/trunk/source/CFGConsoleOut/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.0.1 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, diff --git a/trunk/source/ChcSmtPrinter/META-INF/MANIFEST.MF b/trunk/source/ChcSmtPrinter/META-INF/MANIFEST.MF index 6e576ab173d..aa12fa205b2 100644 --- a/trunk/source/ChcSmtPrinter/META-INF/MANIFEST.MF +++ b/trunk/source/ChcSmtPrinter/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.chc, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils diff --git a/trunk/source/ChcSolver/META-INF/MANIFEST.MF b/trunk/source/ChcSolver/META-INF/MANIFEST.MF index bb37f29b8d8..96e535cce13 100644 --- a/trunk/source/ChcSolver/META-INF/MANIFEST.MF +++ b/trunk/source/ChcSolver/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.chc, de.uni_freiburg.informatik.ultimate.plugins.generator.treeautomizer diff --git a/trunk/source/ChcToBoogie/META-INF/MANIFEST.MF b/trunk/source/ChcToBoogie/META-INF/MANIFEST.MF index 83d8100d8e0..6abe4e544aa 100644 --- a/trunk/source/ChcToBoogie/META-INF/MANIFEST.MF +++ b/trunk/source/ChcToBoogie/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, diff --git a/trunk/source/CodeCheck/META-INF/MANIFEST.MF b/trunk/source/CodeCheck/META-INF/MANIFEST.MF index e33afff57c4..06a4cf9159c 100644 --- a/trunk/source/CodeCheck/META-INF/MANIFEST.MF +++ b/trunk/source/CodeCheck/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.plugins.generator.traceabstraction diff --git a/trunk/source/CoreRCP/META-INF/MANIFEST.MF b/trunk/source/CoreRCP/META-INF/MANIFEST.MF index 3957732ca58..9199e41357f 100644 --- a/trunk/source/CoreRCP/META-INF/MANIFEST.MF +++ b/trunk/source/CoreRCP/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Activator: de.uni_freiburg.informatik.ultimate.core.coreplugin.Activator Require-Bundle: org.eclipse.core.runtime;visibility:=reexport, de.uni_freiburg.informatik.ultimate.lib.core;visibility:=reexport, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel;visibility:=reexport, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, org.apache.log4j, org.apache.commons.lang3, diff --git a/trunk/source/GUIGeneratedPreferencePages/META-INF/MANIFEST.MF b/trunk/source/GUIGeneratedPreferencePages/META-INF/MANIFEST.MF index 2009f747645..ebb37b03baf 100644 --- a/trunk/source/GUIGeneratedPreferencePages/META-INF/MANIFEST.MF +++ b/trunk/source/GUIGeneratedPreferencePages/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: de.uni_freiburg.informatik.ultimate.gui.preferencepages Require-Bundle: org.eclipse.ui;visibility:=reexport, de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.core, org.eclipse.jface, de.uni_freiburg.informatik.ultimate.lib.util diff --git a/trunk/source/GuiRCP/META-INF/MANIFEST.MF b/trunk/source/GuiRCP/META-INF/MANIFEST.MF index 71a140688c1..e28726df16b 100644 --- a/trunk/source/GuiRCP/META-INF/MANIFEST.MF +++ b/trunk/source/GuiRCP/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui;visibility:=reexport, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.gui.preferencepages, de.uni_freiburg.informatik.ultimate.gui.logging Export-Package: diff --git a/trunk/source/IcfgBuilder/META-INF/MANIFEST.MF b/trunk/source/IcfgBuilder/META-INF/MANIFEST.MF index 04671b6ec62..6b6b74e54c5 100644 --- a/trunk/source/IcfgBuilder/META-INF/MANIFEST.MF +++ b/trunk/source/IcfgBuilder/META-INF/MANIFEST.MF @@ -6,11 +6,10 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.smtsolver.external, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.printer, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, diff --git a/trunk/source/IcfgToChc/META-INF/MANIFEST.MF b/trunk/source/IcfgToChc/META-INF/MANIFEST.MF index 1e9156c1324..ac36c3be5d7 100644 --- a/trunk/source/IcfgToChc/META-INF/MANIFEST.MF +++ b/trunk/source/IcfgToChc/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.chc, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils, diff --git a/trunk/source/IcfgTransformation/META-INF/MANIFEST.MF b/trunk/source/IcfgTransformation/META-INF/MANIFEST.MF index 493653c908f..61aa60f5a23 100644 --- a/trunk/source/IcfgTransformation/META-INF/MANIFEST.MF +++ b/trunk/source/IcfgTransformation/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.lib.icfgtransformer diff --git a/trunk/source/InvariantSynthesis/META-INF/MANIFEST.MF b/trunk/source/InvariantSynthesis/META-INF/MANIFEST.MF index 2f4efe428e0..00686f6e4f9 100644 --- a/trunk/source/InvariantSynthesis/META-INF/MANIFEST.MF +++ b/trunk/source/InvariantSynthesis/META-INF/MANIFEST.MF @@ -7,12 +7,11 @@ Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.automata, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.witnessparser, diff --git a/trunk/source/LassoRanker/META-INF/MANIFEST.MF b/trunk/source/LassoRanker/META-INF/MANIFEST.MF index ce9f5b7a4d6..5338fbc039a 100644 --- a/trunk/source/LassoRanker/META-INF/MANIFEST.MF +++ b/trunk/source/LassoRanker/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.boogieast, diff --git a/trunk/source/Library-AcceleratedInterpolation/META-INF/MANIFEST.MF b/trunk/source/Library-AcceleratedInterpolation/META-INF/MANIFEST.MF index adcc84de304..1ca4f13e747 100644 --- a/trunk/source/Library-AcceleratedInterpolation/META-INF/MANIFEST.MF +++ b/trunk/source/Library-AcceleratedInterpolation/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.lib.core, diff --git a/trunk/source/Library-Automata/META-INF/MANIFEST.MF b/trunk/source/Library-Automata/META-INF/MANIFEST.MF index 96a7893b878..f5ba4fe3a83 100644 --- a/trunk/source/Library-Automata/META-INF/MANIFEST.MF +++ b/trunk/source/Library-Automata/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.smtinterpol, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.util, wrapped.net.sf.trove4j.trove4j diff --git a/trunk/source/Library-BoogieAST/META-INF/MANIFEST.MF b/trunk/source/Library-BoogieAST/META-INF/MANIFEST.MF index 8a2cc37662f..2395088c18e 100644 --- a/trunk/source/Library-BoogieAST/META-INF/MANIFEST.MF +++ b/trunk/source/Library-BoogieAST/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Export-Package: de.uni_freiburg.informatik.ultimate.boogie, Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.astbuilder Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.boogieast diff --git a/trunk/source/Library-CHC/META-INF/MANIFEST.MF b/trunk/source/Library-CHC/META-INF/MANIFEST.MF index 037693b9ef5..68ed2bef897 100644 --- a/trunk/source/Library-CHC/META-INF/MANIFEST.MF +++ b/trunk/source/Library-CHC/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.smtsolver.external, diff --git a/trunk/source/Library-IcfgTransformer/META-INF/MANIFEST.MF b/trunk/source/Library-IcfgTransformer/META-INF/MANIFEST.MF index 05b9f9d5ee6..fde4fd297ff 100644 --- a/trunk/source/Library-IcfgTransformer/META-INF/MANIFEST.MF +++ b/trunk/source/Library-IcfgTransformer/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2 Export-Package: de.uni_freiburg.informatik.ultimate.icfgtransformer, diff --git a/trunk/source/Library-IcfgTransformerTest/META-INF/MANIFEST.MF b/trunk/source/Library-IcfgTransformerTest/META-INF/MANIFEST.MF index 5a15c2acc03..ab62ddb6889 100644 --- a/trunk/source/Library-IcfgTransformerTest/META-INF/MANIFEST.MF +++ b/trunk/source/Library-IcfgTransformerTest/META-INF/MANIFEST.MF @@ -9,8 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.test, org.junit, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, diff --git a/trunk/source/Library-LassoRanker/META-INF/MANIFEST.MF b/trunk/source/Library-LassoRanker/META-INF/MANIFEST.MF index 6d901d51cb6..5e750bf65fc 100644 --- a/trunk/source/Library-LassoRanker/META-INF/MANIFEST.MF +++ b/trunk/source/Library-LassoRanker/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Activator: de.uni_freiburg.informatik.ultimate.lassoranker.Activator Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.smtinterpol;resolution:=optional, diff --git a/trunk/source/Library-MCR/META-INF/MANIFEST.MF b/trunk/source/Library-MCR/META-INF/MANIFEST.MF index 1241f642cde..9474ec5d54f 100644 --- a/trunk/source/Library-MCR/META-INF/MANIFEST.MF +++ b/trunk/source/Library-MCR/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, diff --git a/trunk/source/Library-MSOD/META-INF/MANIFEST.MF b/trunk/source/Library-MSOD/META-INF/MANIFEST.MF index 9b0e36ba54e..10f5277197f 100644 --- a/trunk/source/Library-MSOD/META-INF/MANIFEST.MF +++ b/trunk/source/Library-MSOD/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.3.0 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.automata diff --git a/trunk/source/Library-MSODTest/META-INF/MANIFEST.MF b/trunk/source/Library-MSODTest/META-INF/MANIFEST.MF index 179ed078420..0680c4a66bc 100644 --- a/trunk/source/Library-MSODTest/META-INF/MANIFEST.MF +++ b/trunk/source/Library-MSODTest/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.test, org.junit, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external Import-Package: de.uni_freiburg.informatik.ultimate.acsl.parser, de.uni_freiburg.informatik.ultimate.automata.nestedword, diff --git a/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF b/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF index d9bd2d13ccc..830c31fbf0d 100644 --- a/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF +++ b/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF @@ -29,11 +29,10 @@ Export-Package: de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.tracehandling, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.xnf Require-Bundle: de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.boogieast, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, org.apache.commons.lang3 diff --git a/trunk/source/Library-ModelCheckerUtilsTest/META-INF/MANIFEST.MF b/trunk/source/Library-ModelCheckerUtilsTest/META-INF/MANIFEST.MF index 6737029a63d..6f9ab9f82e4 100644 --- a/trunk/source/Library-ModelCheckerUtilsTest/META-INF/MANIFEST.MF +++ b/trunk/source/Library-ModelCheckerUtilsTest/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.test, org.junit, - de.uni_freiburg.informatik.ultimate.lib.smtlib + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol Import-Package: junit.framework, org.junit, org.junit.runner, diff --git a/trunk/source/Library-PDR/META-INF/MANIFEST.MF b/trunk/source/Library-PDR/META-INF/MANIFEST.MF index e234959cdfc..7f0390a22b0 100644 --- a/trunk/source/Library-PDR/META-INF/MANIFEST.MF +++ b/trunk/source/Library-PDR/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder Export-Package: de.uni_freiburg.informatik.ultimate.lib.pdr diff --git a/trunk/source/Library-Proofs/META-INF/MANIFEST.MF b/trunk/source/Library-Proofs/META-INF/MANIFEST.MF index 3a5d52d7ccc..24c999ccd23 100644 --- a/trunk/source/Library-Proofs/META-INF/MANIFEST.MF +++ b/trunk/source/Library-Proofs/META-INF/MANIFEST.MF @@ -5,9 +5,8 @@ Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.lib.proofs Bundle-Version: 0.3.0 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.automata, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.util diff --git a/trunk/source/Library-Sifa/META-INF/MANIFEST.MF b/trunk/source/Library-Sifa/META-INF/MANIFEST.MF index 3af9a7591d4..957eede66f8 100644 --- a/trunk/source/Library-Sifa/META-INF/MANIFEST.MF +++ b/trunk/source/Library-Sifa/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.pathexpressions, diff --git a/trunk/source/Library-SmtLibUtils/META-INF/MANIFEST.MF b/trunk/source/Library-SmtLibUtils/META-INF/MANIFEST.MF index c58c97084ab..a92a5134c4b 100644 --- a/trunk/source/Library-SmtLibUtils/META-INF/MANIFEST.MF +++ b/trunk/source/Library-SmtLibUtils/META-INF/MANIFEST.MF @@ -19,6 +19,5 @@ Export-Package: de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.sc Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.smtsolver.external, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.smtlibutils diff --git a/trunk/source/Library-TraceCheckerUtils/META-INF/MANIFEST.MF b/trunk/source/Library-TraceCheckerUtils/META-INF/MANIFEST.MF index 6ba0ee6d6d0..d4ef1a402b1 100644 --- a/trunk/source/Library-TraceCheckerUtils/META-INF/MANIFEST.MF +++ b/trunk/source/Library-TraceCheckerUtils/META-INF/MANIFEST.MF @@ -16,12 +16,11 @@ Export-Package: de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils.predicates, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils.singletracecheck Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.proofs, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.tracecheckerutils diff --git a/trunk/source/Library-TraceCheckerUtilsTest/META-INF/MANIFEST.MF b/trunk/source/Library-TraceCheckerUtilsTest/META-INF/MANIFEST.MF index b8c05329a72..2082bd6b40f 100644 --- a/trunk/source/Library-TraceCheckerUtilsTest/META-INF/MANIFEST.MF +++ b/trunk/source/Library-TraceCheckerUtilsTest/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.test, org.junit, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external Import-Package: junit.framework, org.junit, diff --git a/trunk/source/Library-UltimateCore/META-INF/MANIFEST.MF b/trunk/source/Library-UltimateCore/META-INF/MANIFEST.MF index a4261fbe93f..22b21439ca0 100644 --- a/trunk/source/Library-UltimateCore/META-INF/MANIFEST.MF +++ b/trunk/source/Library-UltimateCore/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Export-Package: de.uni_freiburg.informatik.ultimate.core.lib.exceptions, de.uni_freiburg.informatik.ultimate.core.lib.util Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.ultimatemodel;visibility:=reexport, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, org.glassfish.hk2.osgi-resource-locator Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.core Import-Package: org.glassfish.jaxb.core.v2 diff --git a/trunk/source/Library-UltimateTest/META-INF/MANIFEST.MF b/trunk/source/Library-UltimateTest/META-INF/MANIFEST.MF index 0c378e75125..0cb92857f46 100644 --- a/trunk/source/Library-UltimateTest/META-INF/MANIFEST.MF +++ b/trunk/source/Library-UltimateTest/META-INF/MANIFEST.MF @@ -23,9 +23,8 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, org.junit, de.uni_freiburg.informatik.ultimate.lib.chc, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, - de.uni_freiburg.informatik.ultimate.smtinterpol, jakarta.activation-api, org.yaml.snakeyaml, org.glassfish.hk2.osgi-resource-locator diff --git a/trunk/source/Library-srParse/META-INF/MANIFEST.MF b/trunk/source/Library-srParse/META-INF/MANIFEST.MF index 9016ee3deb3..e0223226fa8 100644 --- a/trunk/source/Library-srParse/META-INF/MANIFEST.MF +++ b/trunk/source/Library-srParse/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: com.github.jhoenicke.javacup, de.uni_freiburg.informatik.ultimate.lib.pea, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.astbuilder, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: de.uni_freiburg.informatik.ultimate.core.util, diff --git a/trunk/source/PEAtoBoogie/META-INF/MANIFEST.MF b/trunk/source/PEAtoBoogie/META-INF/MANIFEST.MF index fc7ac791552..555df736159 100644 --- a/trunk/source/PEAtoBoogie/META-INF/MANIFEST.MF +++ b/trunk/source/PEAtoBoogie/META-INF/MANIFEST.MF @@ -16,8 +16,7 @@ Require-Bundle: com.github.jhoenicke.javacup, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils, de.uni_freiburg.informatik.ultimate.lib.automata, diff --git a/trunk/source/RCFGBuilder/META-INF/MANIFEST.MF b/trunk/source/RCFGBuilder/META-INF/MANIFEST.MF index 6c1063d572e..c6f7395d402 100644 --- a/trunk/source/RCFGBuilder/META-INF/MANIFEST.MF +++ b/trunk/source/RCFGBuilder/META-INF/MANIFEST.MF @@ -6,11 +6,10 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.smtsolver.external, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.boogie.printer, de.uni_freiburg.informatik.ultimate.lib.smtlibutils diff --git a/trunk/source/ReachingDefinitions/META-INF/MANIFEST.MF b/trunk/source/ReachingDefinitions/META-INF/MANIFEST.MF index 7b692df1079..852970b3440 100644 --- a/trunk/source/ReachingDefinitions/META-INF/MANIFEST.MF +++ b/trunk/source/ReachingDefinitions/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.plugins.analysis.abstractinterpretationv2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/trunk/source/Referee/META-INF/MANIFEST.MF b/trunk/source/Referee/META-INF/MANIFEST.MF index 1c99dc3fa0c..c5bc11d4757 100644 --- a/trunk/source/Referee/META-INF/MANIFEST.MF +++ b/trunk/source/Referee/META-INF/MANIFEST.MF @@ -6,12 +6,10 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.automata, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.witnessparser, diff --git a/trunk/source/ReqParser/META-INF/MANIFEST.MF b/trunk/source/ReqParser/META-INF/MANIFEST.MF index 1fee85025d9..836d411c681 100644 --- a/trunk/source/ReqParser/META-INF/MANIFEST.MF +++ b/trunk/source/ReqParser/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Activator: de.uni_freiburg.informatik.ultimate.reqparser.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: com.github.jhoenicke.javacup, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.srparse, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.util diff --git a/trunk/source/ReqToTest/META-INF/MANIFEST.MF b/trunk/source/ReqToTest/META-INF/MANIFEST.MF index cb4f9f1907d..00fe8f3db48 100644 --- a/trunk/source/ReqToTest/META-INF/MANIFEST.MF +++ b/trunk/source/ReqToTest/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: com.github.jhoenicke.javacup, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.pea2boogie, de.uni_freiburg.informatik.ultimate.lib.core Export-Package: de.uni_freiburg.informatik.ultimate.reqtotest, diff --git a/trunk/source/ReqToTestPowerset/META-INF/MANIFEST.MF b/trunk/source/ReqToTestPowerset/META-INF/MANIFEST.MF index eeba3aa2603..9b0f8307ae1 100644 --- a/trunk/source/ReqToTestPowerset/META-INF/MANIFEST.MF +++ b/trunk/source/ReqToTestPowerset/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: com.github.jhoenicke.javacup, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.pea2boogie, de.uni_freiburg.informatik.ultimate.lib.core Export-Package: de.uni_freiburg.informatik.ultimate.reqtotestpowerset diff --git a/trunk/source/SMTSolverBridge/META-INF/MANIFEST.MF b/trunk/source/SMTSolverBridge/META-INF/MANIFEST.MF index f4de0d2e91a..bdea52f8124 100644 --- a/trunk/source/SMTSolverBridge/META-INF/MANIFEST.MF +++ b/trunk/source/SMTSolverBridge/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: de.uni_freiburg.informatik.ultimate.smtsolver.external Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, com.github.jhoenicke.javacup, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, org.apache.commons.commons-io Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.smtsolver.external diff --git a/trunk/source/Sifa/META-INF/MANIFEST.MF b/trunk/source/Sifa/META-INF/MANIFEST.MF index d4242ef221c..c23fe1a3057 100644 --- a/trunk/source/Sifa/META-INF/MANIFEST.MF +++ b/trunk/source/Sifa/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.pathexpressions, de.uni_freiburg.informatik.ultimate.lib.sifa, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/trunk/source/SmtParser/META-INF/MANIFEST.MF b/trunk/source/SmtParser/META-INF/MANIFEST.MF index 22ef39a3920..d829a6dde15 100644 --- a/trunk/source/SmtParser/META-INF/MANIFEST.MF +++ b/trunk/source/SmtParser/META-INF/MANIFEST.MF @@ -11,9 +11,8 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.chc, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.mso, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.plugins.generator.treeautomizer diff --git a/trunk/source/SpaceExParser/META-INF/MANIFEST.MF b/trunk/source/SpaceExParser/META-INF/MANIFEST.MF index 7b90a484eb5..875a374148b 100644 --- a/trunk/source/SpaceExParser/META-INF/MANIFEST.MF +++ b/trunk/source/SpaceExParser/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, diff --git a/trunk/source/TraceAbstraction/META-INF/MANIFEST.MF b/trunk/source/TraceAbstraction/META-INF/MANIFEST.MF index a407c8181d6..4c6c922bf7f 100644 --- a/trunk/source/TraceAbstraction/META-INF/MANIFEST.MF +++ b/trunk/source/TraceAbstraction/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.plugins.generator.trace Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, diff --git a/trunk/source/TraceAbstractionWithAFAs/META-INF/MANIFEST.MF b/trunk/source/TraceAbstractionWithAFAs/META-INF/MANIFEST.MF index e0455188615..25515c3cc98 100644 --- a/trunk/source/TraceAbstractionWithAFAs/META-INF/MANIFEST.MF +++ b/trunk/source/TraceAbstractionWithAFAs/META-INF/MANIFEST.MF @@ -13,10 +13,9 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.proofs, de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils, de.uni_freiburg.informatik.ultimate.boogie.preprocessor, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.plugins.generator.rcfgbuilder, - de.uni_freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.automata, de.uni_freiburg.informatik.ultimate.plugins.generator.traceabstraction, de.uni_freiburg.informatik.ultimate.plugins.analysis.reachingdefinitions diff --git a/trunk/source/TreeAutomizer/META-INF/MANIFEST.MF b/trunk/source/TreeAutomizer/META-INF/MANIFEST.MF index 6bc08a7b5c5..15f9d4bf141 100644 --- a/trunk/source/TreeAutomizer/META-INF/MANIFEST.MF +++ b/trunk/source/TreeAutomizer/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.ultimatemodel, - de.uni_freiburg.informatik.ultimate.lib.smtlib, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.automata, diff --git a/trunk/source/UltimateEliminatorController/META-INF/MANIFEST.MF b/trunk/source/UltimateEliminatorController/META-INF/MANIFEST.MF index 6ef3a25ce83..10405a65e74 100644 --- a/trunk/source/UltimateEliminatorController/META-INF/MANIFEST.MF +++ b/trunk/source/UltimateEliminatorController/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.core, de.uni_freiburg.informatik.ultimate.lib.util, - de.uni_freiburg.informatik.ultimate.lib.smtlib, - de.uni_freiburg.informatik.ultimate.smtinterpol, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.smtsolver.external, de.uni_freiburg.informatik.ultimate.lib.smtlibutils diff --git a/trunk/source/WitnessPrinter/META-INF/MANIFEST.MF b/trunk/source/WitnessPrinter/META-INF/MANIFEST.MF index be6bc0cc6d9..ff00531f8c8 100644 --- a/trunk/source/WitnessPrinter/META-INF/MANIFEST.MF +++ b/trunk/source/WitnessPrinter/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Bundle-Activator: de.uni_freiburg.informatik.ultimate.witnessprinter.Activator Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, - de.uni_freiburg.informatik.ultimate.lib.smtlib, de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, org.apache.commons.lang3, From f2089007a6366b52f14db7c2b1932d8e3dfa58e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Fri, 21 Mar 2025 11:06:26 +0100 Subject: [PATCH 02/11] Add missing packages to manifests --- trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF | 1 + trunk/source/ConstraintParser/.classpath | 1 - trunk/source/ConstraintParser/META-INF/MANIFEST.MF | 3 ++- trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF | 2 +- trunk/source/Library-srParse/META-INF/MANIFEST.MF | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF b/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF index 090482ed10c..3104d884969 100644 --- a/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF +++ b/trunk/source/AbstractInterpretationV2/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.plugins.analysis.abstra Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.3.0 Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, + de.uni_freiburg.informatik.ultimate.lib.smtlibutils, wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.util, diff --git a/trunk/source/ConstraintParser/.classpath b/trunk/source/ConstraintParser/.classpath index a49c8aa1fbb..e416214f73e 100644 --- a/trunk/source/ConstraintParser/.classpath +++ b/trunk/source/ConstraintParser/.classpath @@ -2,7 +2,6 @@ - diff --git a/trunk/source/ConstraintParser/META-INF/MANIFEST.MF b/trunk/source/ConstraintParser/META-INF/MANIFEST.MF index 996ab192dfe..e10a118d276 100644 --- a/trunk/source/ConstraintParser/META-INF/MANIFEST.MF +++ b/trunk/source/ConstraintParser/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.constraintparser Bundle-Vendor: Ultimate Program Analysis Team Bundle-Version: 0.0.1 Export-Package: de.uni_freiburg.informatik.ultimate.constraintparser -Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core +Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.core, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.constraintparser Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF b/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF index 830c31fbf0d..23c2a385f55 100644 --- a/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF +++ b/trunk/source/Library-ModelCheckerUtils/META-INF/MANIFEST.MF @@ -29,8 +29,8 @@ Export-Package: de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.tracehandling, de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.xnf Require-Bundle: de.uni_freiburg.informatik.ultimate.core, - wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.util, + wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils, de.uni_freiburg.informatik.ultimate.lib.boogieast, de.uni_freiburg.informatik.ultimate.smtsolver.external, diff --git a/trunk/source/Library-srParse/META-INF/MANIFEST.MF b/trunk/source/Library-srParse/META-INF/MANIFEST.MF index e0223226fa8..6619e363e9c 100644 --- a/trunk/source/Library-srParse/META-INF/MANIFEST.MF +++ b/trunk/source/Library-srParse/META-INF/MANIFEST.MF @@ -11,11 +11,11 @@ Require-Bundle: com.github.jhoenicke.javacup, de.uni_freiburg.informatik.ultimate.lib.core, de.uni_freiburg.informatik.ultimate.lib.pea, de.uni_freiburg.informatik.ultimate.lib.boogieast, + de.uni_freiburg.informatik.ultimate.lib.util, de.uni_freiburg.informatik.ultimate.astbuilder, wrapped.de.uni-freiburg.informatik.ultimate.smtinterpol, de.uni_freiburg.informatik.ultimate.lib.smtlibutils Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: de.uni_freiburg.informatik.ultimate.core.util, - de.uni_freiburg.informatik.ultimate.util, de.uni_freiburg.informatik.ultimate.util.datastructures.relation Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.srparse From 75f5f808abea923649c53acf2ca7b5199b73b45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Fri, 21 Mar 2025 11:10:19 +0100 Subject: [PATCH 03/11] Move classes from Library-SMTLIB to Library-SmtLibUtils --- .../NestedWordAutomatonReachableStates.java | 2 +- .../ultimate/lassoranker/LassoAnalysis.java | 2 +- .../NonTerminationArgumentSynthesizer.java | 2 +- .../smt/predicates/PredicateUnifier.java | 2 +- .../lib/smtlibutils/CommuhashNormalForm.java | 1 - .../lib/smtlibutils/DebugMessage.java | 89 +++++++++++++++++++ .../lib/smtlibutils/INonSolverScript.java | 48 ++++++++++ .../ultimate/lib/smtlibutils/SmtUtils.java | 1 - .../ExplicitLhsPolynomialRelation.java | 2 +- .../polynomials/PolynomialRelation.java | 2 +- .../polynomials/SolveForSubjectUtils.java | 2 +- .../lib/smtlibutils/quantifier/XnfDer.java | 2 +- .../NestedInterpolantsBuilder.java | 2 +- .../singletracecheck/TraceCheckUtils.java | 2 +- .../smtparser/chc/HornClauseParserScript.java | 2 +- 15 files changed, 148 insertions(+), 13 deletions(-) create mode 100644 trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/DebugMessage.java create mode 100644 trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/INonSolverScript.java diff --git a/trunk/source/Library-Automata/src/de/uni_freiburg/informatik/ultimate/automata/nestedword/reachablestates/NestedWordAutomatonReachableStates.java b/trunk/source/Library-Automata/src/de/uni_freiburg/informatik/ultimate/automata/nestedword/reachablestates/NestedWordAutomatonReachableStates.java index 8fe8feaf903..5acd1903bcf 100644 --- a/trunk/source/Library-Automata/src/de/uni_freiburg/informatik/ultimate/automata/nestedword/reachablestates/NestedWordAutomatonReachableStates.java +++ b/trunk/source/Library-Automata/src/de/uni_freiburg/informatik/ultimate/automata/nestedword/reachablestates/NestedWordAutomatonReachableStates.java @@ -69,7 +69,7 @@ import de.uni_freiburg.informatik.ultimate.core.lib.exceptions.RunningTaskInfo; import de.uni_freiburg.informatik.ultimate.core.lib.exceptions.ToolchainCanceledException; import de.uni_freiburg.informatik.ultimate.core.model.services.ILogger; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.util.InCaReCounter; import de.uni_freiburg.informatik.ultimate.util.datastructures.relation.HashRelation; diff --git a/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/LassoAnalysis.java b/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/LassoAnalysis.java index 90fabf26b43..98081f331ef 100644 --- a/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/LassoAnalysis.java +++ b/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/LassoAnalysis.java @@ -74,13 +74,13 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.cfg.transitions.UnmodifiableTransFormula; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.cfg.variables.IProgramNonOldVar; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.SMTPrettyPrinter; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils.SimplificationTechnique; import de.uni_freiburg.informatik.ultimate.logic.Rational; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script.LBool; import de.uni_freiburg.informatik.ultimate.logic.Term; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; /** * This is the class that controls LassoRanker's (non-)termination analysis diff --git a/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/nontermination/NonTerminationArgumentSynthesizer.java b/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/nontermination/NonTerminationArgumentSynthesizer.java index 4a5cb982545..0174f6476c0 100644 --- a/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/nontermination/NonTerminationArgumentSynthesizer.java +++ b/trunk/source/Library-LassoRanker/src/de/uni_freiburg/informatik/ultimate/lassoranker/nontermination/NonTerminationArgumentSynthesizer.java @@ -49,6 +49,7 @@ import de.uni_freiburg.informatik.ultimate.lassoranker.ModelExtractionUtils; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.cfg.variables.IProgramVar; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.SMTPrettyPrinter; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.solverbuilder.SolverBuilder; @@ -63,7 +64,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Sort; import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.TermVariable; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; /** * The non-termination template checks for non-termination. diff --git a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/predicates/PredicateUnifier.java b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/predicates/PredicateUnifier.java index 0ab04208d4b..192da51aa92 100644 --- a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/predicates/PredicateUnifier.java +++ b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/predicates/PredicateUnifier.java @@ -50,6 +50,7 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.MonolithicImplicationChecker; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.PredicateUnifierStatisticsGenerator.PredicateUnifierStatisticsType; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.CommuhashNormalForm; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.IncrementalPlicationChecker.Validity; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtTestGenerationUtils; @@ -67,7 +68,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.TermVariable; import de.uni_freiburg.informatik.ultimate.smtinterpol.util.DAGSize; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; import de.uni_freiburg.informatik.ultimate.util.datastructures.poset.IPartialComparator; import de.uni_freiburg.informatik.ultimate.util.datastructures.poset.IPartialComparator.ComparisonResult; import de.uni_freiburg.informatik.ultimate.util.datastructures.poset.PosetUtils; diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/CommuhashNormalForm.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/CommuhashNormalForm.java index d4986840a7b..eaa43636ca0 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/CommuhashNormalForm.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/CommuhashNormalForm.java @@ -40,7 +40,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.TermTransformer; import de.uni_freiburg.informatik.ultimate.logic.Util; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; /** * Brings Terms into a normal form where all parameters that of commutative functions (resp. functions for that this diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/DebugMessage.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/DebugMessage.java new file mode 100644 index 00000000000..37e6be8caf9 --- /dev/null +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/DebugMessage.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2009-2012 Juergen Christ + * Copyright (C) 2009-2012 University of Freiburg + * + * This file is part of the ULTIMATE SmtLibUtils Library. + * + * The ULTIMATE SmtLibUtils Library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The ULTIMATE SmtLibUtils Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the ULTIMATE SmtLibUtils Library. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * If you modify the ULTIMATE SmtLibUtils Library, or any covered work, by linking + * or combining it with Eclipse RCP (or a modified version of Eclipse RCP), + * containing parts covered by the terms of the Eclipse Public License, the + * licensors of the ULTIMATE SmtLibUtils Library grant you additional permission + * to convey the resulting work. + */ +package de.uni_freiburg.informatik.ultimate.lib.smtlibutils; + +import java.text.FieldPosition; +import java.text.Format; +import java.text.MessageFormat; +import java.text.ParsePosition; + +import de.uni_freiburg.informatik.ultimate.logic.Term; + +/** + * Class used to prevent unnecessary String conversions and concatenations. + * + * Just use {num} to refer to the array position like in + * new DebugMessage("Arg 1 is {1} and 0 is {0}",obj0,obj1). The string is formatted by + * {@link java.text.MessageFormat}. + * + * @author Juergen Christ + */ +public class DebugMessage { + private static class TermDirectFormat extends Format { + + private static final long serialVersionUID = -6518060753837104534L; + + @Override + public StringBuffer format(final Object obj, final StringBuffer toAppendTo, final FieldPosition pos) { + return toAppendTo.append(((Term) obj).toStringDirect()); + } + + @Override + public Object parseObject(final String source, final ParsePosition pos) { + throw new UnsupportedOperationException(); + } + + } + + private static final TermDirectFormat TERM_FORMAT = new TermDirectFormat(); + private final boolean mTermDirect; + private final String mMsg; + private final Object[] mParams; + + public DebugMessage(final String msg, final Object... params) { + this(false, msg, params); + } + + public DebugMessage(final boolean termDirect, final String msg, final Object... params) { + mTermDirect = termDirect; + mMsg = msg; + mParams = params; + } + + @Override + public String toString() { + final MessageFormat mf = new MessageFormat(mMsg); + if (mTermDirect) { + for (int i = 0; i < mParams.length; ++i) { + if (mParams[i] instanceof Term) { + mf.setFormatByArgumentIndex(i, TERM_FORMAT); + } + } + } + return mf.format(mParams, new StringBuffer(), null).toString(); + } +} diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/INonSolverScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/INonSolverScript.java new file mode 100644 index 00000000000..f53a6e27832 --- /dev/null +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/INonSolverScript.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2018 Alexander Nutz (nutz@informatik.uni-freiburg.de) + * Copyright (C) 2018 University of Freiburg + * + * This file is part of the ULTIMATE SmtLibUtils Library. + * + * The ULTIMATE SmtLibUtils Library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The ULTIMATE SmtLibUtils Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the ULTIMATE SmtLibUtils Library. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * If you modify the ULTIMATE SmtLibUtils Library, or any covered work, by linking + * or combining it with Eclipse RCP (or a modified version of Eclipse RCP), + * containing parts covered by the terms of the Eclipse Public License, the + * licensors of the ULTIMATE SmtLibUtils Library grant you additional permission + * to convey the resulting work. + */ + +package de.uni_freiburg.informatik.ultimate.lib.smtlibutils; + +import de.uni_freiburg.informatik.ultimate.logic.Script; +import de.uni_freiburg.informatik.ultimate.logic.Term; +import de.uni_freiburg.informatik.ultimate.smtinterpol.smtlib2.SMTInterpol; +import de.uni_freiburg.informatik.ultimate.smtsolver.external.Scriptor; + +/** + * Empty interface that can be used to mark subclasses of {@link Script} that cannot answer check-sat queries. (E.g. + * classes that are only used for building {@link Term}s during parsing.) + *

+ * Note that this class is a symptom of an architectural problem: Some subclasses of Script are used as an interface to + * an actual SMT solver ({@link SMTInterpol}, {@link Scriptor}), other subclasses are used only for parsing and building + * {@link Term}s). Once the Script class is split according to these functionalities, this interface should become + * obsolete. + * + * @author Alexander Nutz (nutz@informatik.uni-freiburg.de) + */ +public interface INonSolverScript { + +} diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/SmtUtils.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/SmtUtils.java index 1f3be6ce768..83951826d68 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/SmtUtils.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/SmtUtils.java @@ -95,7 +95,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Util; import de.uni_freiburg.informatik.ultimate.smtinterpol.util.DAGSize; import de.uni_freiburg.informatik.ultimate.util.CoreUtil; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; import de.uni_freiburg.informatik.ultimate.util.ReflectionUtil; import de.uni_freiburg.informatik.ultimate.util.datastructures.BitvectorConstant; import de.uni_freiburg.informatik.ultimate.util.datastructures.DataStructureUtils; diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/ExplicitLhsPolynomialRelation.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/ExplicitLhsPolynomialRelation.java index 8460a8f3c5e..3536087f8ea 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/ExplicitLhsPolynomialRelation.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/ExplicitLhsPolynomialRelation.java @@ -38,6 +38,7 @@ import java.util.Map.Entry; import java.util.Set; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.INonSolverScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ITermProvider; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; @@ -48,7 +49,6 @@ import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.polynomials.MultiCaseSolvedBinaryRelation.Xnf; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.polynomials.PolynomialRelation.TransformInequality; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.quantifier.XnfTir; -import de.uni_freiburg.informatik.ultimate.logic.INonSolverScript; import de.uni_freiburg.informatik.ultimate.logic.Rational; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Script.LBool; diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/PolynomialRelation.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/PolynomialRelation.java index e0663282573..36a49335ac5 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/PolynomialRelation.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/PolynomialRelation.java @@ -38,6 +38,7 @@ import java.util.function.Predicate; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.BitvectorUtils; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.INonSolverScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ITermProvider; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; @@ -48,7 +49,6 @@ import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.binaryrelation.RelationSymbol; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.binaryrelation.SolvedBinaryRelation; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.quantifier.DualJunctionTir; -import de.uni_freiburg.informatik.ultimate.logic.INonSolverScript; import de.uni_freiburg.informatik.ultimate.logic.QuantifiedFormula; import de.uni_freiburg.informatik.ultimate.logic.Rational; import de.uni_freiburg.informatik.ultimate.logic.Script; diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/SolveForSubjectUtils.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/SolveForSubjectUtils.java index 717058844b7..341c4f39923 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/SolveForSubjectUtils.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/polynomials/SolveForSubjectUtils.java @@ -39,6 +39,7 @@ import java.util.Map; import java.util.Set; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.INonSolverScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; @@ -50,7 +51,6 @@ import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.polynomials.MultiCaseSolvedBinaryRelation.Xnf; import de.uni_freiburg.informatik.ultimate.logic.ApplicationTerm; import de.uni_freiburg.informatik.ultimate.logic.ConstantTerm; -import de.uni_freiburg.informatik.ultimate.logic.INonSolverScript; import de.uni_freiburg.informatik.ultimate.logic.Rational; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Script.LBool; diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/quantifier/XnfDer.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/quantifier/XnfDer.java index b3b791e68e9..aa9be7c2218 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/quantifier/XnfDer.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/quantifier/XnfDer.java @@ -41,6 +41,7 @@ import de.uni_freiburg.informatik.ultimate.core.lib.exceptions.ToolchainCanceledException; import de.uni_freiburg.informatik.ultimate.core.model.services.ILogger; import de.uni_freiburg.informatik.ultimate.core.model.services.IUltimateServiceProvider; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.Substitution; @@ -53,7 +54,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.TermVariable; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; import de.uni_freiburg.informatik.ultimate.util.datastructures.relation.Pair; /** diff --git a/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/NestedInterpolantsBuilder.java b/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/NestedInterpolantsBuilder.java index c085f67ba0c..9afff9dbef3 100644 --- a/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/NestedInterpolantsBuilder.java +++ b/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/NestedInterpolantsBuilder.java @@ -52,6 +52,7 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.IPredicateUnifier; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.SPredicate; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.scripttransfer.TermTransferrer; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils.SimplificationTechnique; @@ -73,7 +74,6 @@ import de.uni_freiburg.informatik.ultimate.logic.Util; import de.uni_freiburg.informatik.ultimate.smtinterpol.model.ConstantTermNormalizer; import de.uni_freiburg.informatik.ultimate.util.CoreUtil; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; import de.uni_freiburg.informatik.ultimate.util.datastructures.relation.Triple; /** diff --git a/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/TraceCheckUtils.java b/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/TraceCheckUtils.java index 5dad028491a..d5bca4b9044 100644 --- a/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/TraceCheckUtils.java +++ b/trunk/source/Library-TraceCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/tracecheckerutils/singletracecheck/TraceCheckUtils.java @@ -69,6 +69,7 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.IPredicateUnifier; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.PredicateUtils; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.TermVarsFuns; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.DebugMessage; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.IncrementalPlicationChecker.Validity; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtUtils; @@ -77,7 +78,6 @@ import de.uni_freiburg.informatik.ultimate.lib.tracecheckerutils.CoverageAnalysis.BackwardCoveringInformation; import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.TermVariable; -import de.uni_freiburg.informatik.ultimate.util.DebugMessage; /** * Class that contains static methods that are related to the {@link TraceCheck}. diff --git a/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/chc/HornClauseParserScript.java b/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/chc/HornClauseParserScript.java index 506b295fd4b..094671a89eb 100644 --- a/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/chc/HornClauseParserScript.java +++ b/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/chc/HornClauseParserScript.java @@ -50,6 +50,7 @@ import de.uni_freiburg.informatik.ultimate.lib.chc.HornClauseAST; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.scripttransfer.HistoryRecordingScript; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.scripttransfer.TermTransferrer; +import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.INonSolverScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.PureSubstitution; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; @@ -64,7 +65,6 @@ import de.uni_freiburg.informatik.ultimate.logic.FormulaUnLet; import de.uni_freiburg.informatik.ultimate.logic.FormulaUnLet.UnletType; import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; -import de.uni_freiburg.informatik.ultimate.logic.INonSolverScript; import de.uni_freiburg.informatik.ultimate.logic.Logics; import de.uni_freiburg.informatik.ultimate.logic.Model; import de.uni_freiburg.informatik.ultimate.logic.NoopScript; From 4deb2bf981e7426837cbd8e4028760e1ee5b77dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Fri, 21 Mar 2025 11:17:25 +0100 Subject: [PATCH 04/11] Add missing implementations for various scripts Previously, Ultimate had a slightly changed version of WrapperScript from SMTInterpol, where getFunctionSymbol (4593dc5) and getInterpolants (b26e8fa) were already implemented. To comply with the Maven dependency, these methods have to be implemented in the implementations of WrapperScript instead. Alternatively, these methods could be also implemented in SMTInterpol as previously done in Ultimate. --- .../smt/QuantifierOverapproximatingSolver.java | 11 +++++++++++ .../modelcheckerutils/smt/UltimateEliminator.java | 12 ++++++++++++ .../smt/UltimateInterpolator.java | 13 +++++++++++++ .../smt/scripttransfer/HistoryRecordingScript.java | 12 ++++++++++++ .../ultimate/lib/smtlibutils/StatisticsScript.java | 12 ++++++++++++ .../lib/smtlibutils/UndoableWrapperScript.java | 12 ++++++++++++ .../lib/smtlibutils/arrays/DiffWrapperScript.java | 12 ++++++++++++ .../LoggingScriptForNonIncrementalBenchmarks.java | 12 ++++++++++++ .../solverbuilder/SMTFeatureExtractorScript.java | 12 ++++++++++++ .../ScriptWithTermConstructionChecks.java | 13 +++++++++++++ .../smtlibutils/solverbuilder/SolverBuilder.java | 14 ++++++++++++++ .../smtparser/ResultReportingWrapperScript.java | 13 +++++++++++++ .../PredicateParsingWrapperScript.java | 12 ++++++++++++ 13 files changed, 160 insertions(+) diff --git a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/QuantifierOverapproximatingSolver.java b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/QuantifierOverapproximatingSolver.java index ee8142a366f..8cd0c951d47 100644 --- a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/QuantifierOverapproximatingSolver.java +++ b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/QuantifierOverapproximatingSolver.java @@ -49,6 +49,7 @@ import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.quantifier.QuantifierSequence.QuantifiedVariables; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.quantifier.QuantifierUtils; import de.uni_freiburg.informatik.ultimate.logic.FormulaUnLet; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.QuantifiedFormula; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; @@ -211,4 +212,14 @@ public Set getAdditionalUnsatCoreContent() { return mAdditionalUnsatCoreContent; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateEliminator.java b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateEliminator.java index 8c8871325e6..3ab41c17ebb 100644 --- a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateEliminator.java +++ b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateEliminator.java @@ -50,6 +50,7 @@ import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.quantifier.QuantifierUtils; import de.uni_freiburg.informatik.ultimate.logic.Annotation; import de.uni_freiburg.informatik.ultimate.logic.FormulaUnLet; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.Logics; import de.uni_freiburg.informatik.ultimate.logic.QuantifiedFormula; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; @@ -276,6 +277,17 @@ public Term simplify(final Term term) throws SMTLIBException { return lessQuantifier; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } + private IResult constructResult(final String command, final String response) { final String shortDescription = "Response to " + command + " command"; final String longDescription = "Response to " + command + " command is: " + response; diff --git a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateInterpolator.java b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateInterpolator.java index 41fd73e57a0..6bdf841d9d7 100644 --- a/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateInterpolator.java +++ b/trunk/source/Library-ModelCheckerUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/UltimateInterpolator.java @@ -29,7 +29,10 @@ import de.uni_freiburg.informatik.ultimate.core.model.services.ILogger; import de.uni_freiburg.informatik.ultimate.core.model.services.IUltimateServiceProvider; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.ManagedScript; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; +import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; +import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.WrapperScript; /** @@ -50,4 +53,14 @@ public UltimateInterpolator(final IUltimateServiceProvider services, final ILogg mMgdScript = new ManagedScript(services, mScript); } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/scripttransfer/HistoryRecordingScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/scripttransfer/HistoryRecordingScript.java index ecc0db72063..4ba0f5e7ca5 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/scripttransfer/HistoryRecordingScript.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/modelcheckerutils/smt/scripttransfer/HistoryRecordingScript.java @@ -34,6 +34,7 @@ import java.util.Map; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.scripttransfer.ISmtDeclarable.IllegalSmtDeclarableUsageException; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Sort; @@ -228,6 +229,17 @@ public String toString() { return getClass().getSimpleName() + ": " + mHistory; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } + private static final class StackMarker implements ISmtDeclarable { private static final StackMarker INSTANCE = new StackMarker(); diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/StatisticsScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/StatisticsScript.java index bf38cc8ac1a..9a82252f605 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/StatisticsScript.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/StatisticsScript.java @@ -26,8 +26,10 @@ */ package de.uni_freiburg.informatik.ultimate.lib.smtlibutils; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; +import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.WrapperScript; /** @@ -61,4 +63,14 @@ public LBool checkSat() throws SMTLIBException { return result; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/UndoableWrapperScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/UndoableWrapperScript.java index eda0dfca174..8dad199c802 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/UndoableWrapperScript.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/UndoableWrapperScript.java @@ -26,8 +26,10 @@ */ package de.uni_freiburg.informatik.ultimate.lib.smtlibutils; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; +import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.WrapperScript; /** @@ -88,4 +90,14 @@ public int restore() { return rtr; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/arrays/DiffWrapperScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/arrays/DiffWrapperScript.java index fd4f9958dcc..dd90a72936d 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/arrays/DiffWrapperScript.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/arrays/DiffWrapperScript.java @@ -21,6 +21,7 @@ import de.uni_freiburg.informatik.ultimate.logic.ApplicationTerm; import de.uni_freiburg.informatik.ultimate.logic.FormulaLet; import de.uni_freiburg.informatik.ultimate.logic.FormulaUnLet; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.Logics; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; @@ -111,6 +112,17 @@ public LBool assertTerm(Term term) throws SMTLIBException { return mScript.assertTerm(term); } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } + /** * Get a unique name for a sort s that can be used as part of identifier. * diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/LoggingScriptForNonIncrementalBenchmarks.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/LoggingScriptForNonIncrementalBenchmarks.java index 8ea647fef15..3679b298444 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/LoggingScriptForNonIncrementalBenchmarks.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/LoggingScriptForNonIncrementalBenchmarks.java @@ -62,6 +62,7 @@ import java.util.Map; import de.uni_freiburg.informatik.ultimate.logic.Assignments; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.Logics; import de.uni_freiburg.informatik.ultimate.logic.Model; import de.uni_freiburg.informatik.ultimate.logic.PrintTerm; @@ -567,4 +568,15 @@ public Term[] getUnsatAssumptions() throws SMTLIBException, UnsupportedOperation public void resetAssertions() { throw new UnsupportedOperationException("Introduced in SMTInterpol 2.1-324-ga0525a0, not yet supported"); } + + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SMTFeatureExtractorScript.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SMTFeatureExtractorScript.java index 7c259fd2b33..761c9273c57 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SMTFeatureExtractorScript.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SMTFeatureExtractorScript.java @@ -34,6 +34,7 @@ import java.util.stream.Collectors; import de.uni_freiburg.informatik.ultimate.core.model.services.ILogger; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Sort; @@ -102,6 +103,17 @@ public LBool checkSat() throws SMTLIBException { return sat; } + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } + private static final class StackMarker extends Term { private static final StackMarker INSTANCE = new StackMarker(); diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/ScriptWithTermConstructionChecks.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/ScriptWithTermConstructionChecks.java index 35cb857737e..f7bb513de94 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/ScriptWithTermConstructionChecks.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/ScriptWithTermConstructionChecks.java @@ -27,6 +27,8 @@ package de.uni_freiburg.informatik.ultimate.lib.smtlibutils.solverbuilder; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; +import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Sort; import de.uni_freiburg.informatik.ultimate.logic.Term; @@ -90,4 +92,15 @@ public Term[] getUnsatAssumptions() { public void resetAssertions() { throw new UnsupportedOperationException("Introduced in SMTInterpol 2.1-324-ga0525a0, not yet supported"); } + + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SolverBuilder.java b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SolverBuilder.java index e253fc76b5f..017b242af21 100644 --- a/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SolverBuilder.java +++ b/trunk/source/Library-SmtLibUtils/src/de/uni_freiburg/informatik/ultimate/lib/smtlibutils/solverbuilder/SolverBuilder.java @@ -42,11 +42,14 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.scripttransfer.HistoryRecordingScript; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.SmtSortUtils; import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.arrays.DiffWrapperScript; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.LoggingScript; import de.uni_freiburg.informatik.ultimate.logic.Logics; import de.uni_freiburg.informatik.ultimate.logic.QuotedObject; +import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Sort; +import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.WrapperScript; import de.uni_freiburg.informatik.ultimate.smtinterpol.LogProxy; import de.uni_freiburg.informatik.ultimate.smtinterpol.muses.MusEnumerationScript; @@ -800,6 +803,17 @@ private void removeFromStorage() { private String getKey() { return getClass().getSimpleName() + mId; } + + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } /** diff --git a/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/ResultReportingWrapperScript.java b/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/ResultReportingWrapperScript.java index 372b40dac91..f254258c0e8 100644 --- a/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/ResultReportingWrapperScript.java +++ b/trunk/source/SmtParser/src/de/uni_freiburg/informatik/ultimate/source/smtparser/ResultReportingWrapperScript.java @@ -30,8 +30,10 @@ import de.uni_freiburg.informatik.ultimate.core.model.results.IResult; import de.uni_freiburg.informatik.ultimate.core.model.results.IResultWithSeverity.Severity; import de.uni_freiburg.informatik.ultimate.core.model.services.IUltimateServiceProvider; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; +import de.uni_freiburg.informatik.ultimate.logic.Term; import de.uni_freiburg.informatik.ultimate.logic.WrapperScript; /** @@ -67,4 +69,15 @@ public LBool checkSat() throws SMTLIBException { return result; } + + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } diff --git a/trunk/source/TraceAbstraction/src/de/uni_freiburg/informatik/ultimate/plugins/generator/traceabstraction/PredicateParsingWrapperScript.java b/trunk/source/TraceAbstraction/src/de/uni_freiburg/informatik/ultimate/plugins/generator/traceabstraction/PredicateParsingWrapperScript.java index dbdcd850c5a..8950278856f 100644 --- a/trunk/source/TraceAbstraction/src/de/uni_freiburg/informatik/ultimate/plugins/generator/traceabstraction/PredicateParsingWrapperScript.java +++ b/trunk/source/TraceAbstraction/src/de/uni_freiburg/informatik/ultimate/plugins/generator/traceabstraction/PredicateParsingWrapperScript.java @@ -34,6 +34,7 @@ import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.cfg.IcfgUtils; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.cfg.variables.IProgramVar; import de.uni_freiburg.informatik.ultimate.lib.modelcheckerutils.smt.predicates.IPredicate; +import de.uni_freiburg.informatik.ultimate.logic.FunctionSymbol; import de.uni_freiburg.informatik.ultimate.logic.SMTLIBException; import de.uni_freiburg.informatik.ultimate.logic.Script; import de.uni_freiburg.informatik.ultimate.logic.Sort; @@ -80,4 +81,15 @@ public Term term(final String funcname, final String[] indices, final Sort retur } return mScript.term(funcname, indices, returnSort, params); } + + @Override + public FunctionSymbol getFunctionSymbol(final String constructor) { + return mScript.getFunctionSymbol(constructor); + } + + @Override + public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) + throws SMTLIBException, UnsupportedOperationException { + return mScript.getInterpolants(partition, startOfSubtree, proofTree); + } } From fa3a1851fff3ee66c8f4f2e87b57afeb97628f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Fri, 21 Mar 2025 11:18:05 +0100 Subject: [PATCH 05/11] Remove SMTInterpol source files --- trunk/source/Library-SMTLIB/.classpath | 7 - trunk/source/Library-SMTLIB/.project | 28 - .../Library-SMTLIB/META-INF/MANIFEST.MF | 12 - trunk/source/Library-SMTLIB/build.properties | 4 - trunk/source/Library-SMTLIB/pom.xml | 15 - .../ultimate/logic/AnnotatedTerm.java | 88 - .../informatik/ultimate/logic/Annotation.java | 105 - .../ultimate/logic/ApplicationTerm.java | 96 - .../ultimate/logic/Assignments.java | 177 - .../ultimate/logic/CheckClosedTerm.java | 143 - .../ultimate/logic/ComputeFreeVariables.java | 316 - .../ultimate/logic/ConstantTerm.java | 132 - .../informatik/ultimate/logic/DataType.java | 154 - .../informatik/ultimate/logic/FormulaLet.java | 997 ---- .../ultimate/logic/FormulaUnLet.java | 368 -- .../ultimate/logic/FormulaWalker.java | 173 - .../ultimate/logic/FunctionSymbol.java | 385 -- .../ultimate/logic/FunctionSymbolFactory.java | 133 - .../ultimate/logic/INonSolverScript.java | 16 - .../ultimate/logic/IRAConstantFormatter.java | 52 - .../ultimate/logic/IRAWrapperFactory.java | 109 - .../ultimate/logic/IsConstructorFactory.java | 28 - .../informatik/ultimate/logic/LambdaTerm.java | 95 - .../informatik/ultimate/logic/LetTerm.java | 101 - .../ultimate/logic/LoggingScript.java | 562 -- .../informatik/ultimate/logic/Logics.java | 275 - .../informatik/ultimate/logic/MatchTerm.java | 102 - .../informatik/ultimate/logic/Model.java | 81 - .../ultimate/logic/MutableRational.java | 532 -- .../ultimate/logic/NonRecursive.java | 175 - .../informatik/ultimate/logic/NoopScript.java | 617 -- .../ultimate/logic/OccurrenceCounter.java | 174 - .../logic/PolymorphicFunctionSymbol.java | 77 - .../informatik/ultimate/logic/PrintTerm.java | 162 - .../ultimate/logic/QuantifiedFormula.java | 109 - .../ultimate/logic/QuotedObject.java | 117 - .../informatik/ultimate/logic/Rational.java | 931 --- .../ultimate/logic/ReasonUnknown.java | 64 - .../ultimate/logic/SMTLIBConstants.java | 247 - .../ultimate/logic/SMTLIBException.java | 47 - .../informatik/ultimate/logic/Script.java | 680 --- .../informatik/ultimate/logic/Sort.java | 360 -- .../informatik/ultimate/logic/SortSymbol.java | 247 - .../informatik/ultimate/logic/Term.java | 130 - .../ultimate/logic/TermEquivalence.java | 248 - .../ultimate/logic/TermTransformer.java | 638 -- .../ultimate/logic/TermVariable.java | 87 - .../informatik/ultimate/logic/Theory.java | 1886 ------ .../informatik/ultimate/logic/Util.java | 256 - .../ultimate/logic/WrapperScript.java | 377 -- .../logic/simplification/PushPopChecker.java | 60 - .../logic/simplification/SimplifyDDA.java | 764 --- .../ultimate/util/DebugMessage.java | 79 - .../ultimate/util/PushPopChecker.java | 60 - trunk/source/Library-SMTLIBTest/.classpath | 7 - trunk/source/Library-SMTLIBTest/.project | 28 - .../Library-SMTLIBTest/META-INF/MANIFEST.MF | 11 - .../Library-SMTLIBTest/build.properties | 4 - trunk/source/Library-SMTLIBTest/pom.xml | 42 - .../ultimate/logic/FunctionTest.java | 101 - .../informatik/ultimate/logic/LetTest.java | 165 - .../informatik/ultimate/logic/LogicTest.java | 107 - .../ultimate/logic/ModelValueTest.java | 58 - .../ultimate/logic/MutableRationalTest.java | 78 - .../informatik/ultimate/logic/PrintTest.java | 83 - .../ultimate/logic/RationalTermTest.java | 295 - .../ultimate/logic/RationalTest.java | 229 - .../informatik/ultimate/logic/SortTest.java | 151 - .../ultimate/logic/TermEquivalenceTest.java | 43 - .../informatik/ultimate/logic/UnfletTest.java | 236 - trunk/source/SMTInterpol/.classpath | 7 - .../SMTInterpol-Generator.launch | 23 - trunk/source/SMTInterpol/.project | 36 - trunk/source/SMTInterpol/META-INF/MANIFEST.MF | 20 - trunk/source/SMTInterpol/README.txt | 58 - trunk/source/SMTInterpol/build.properties | 9 - trunk/source/SMTInterpol/build.xml | 160 - trunk/source/SMTInterpol/pom.xml | 57 - .../ultimate/smtinterpol/ChannelUtil.java | 39 - .../ultimate/smtinterpol/Config.java | 117 - .../ultimate/smtinterpol/DefaultLogger.java | 218 - .../ultimate/smtinterpol/IParser.java | 41 - .../ultimate/smtinterpol/InputTruncation.java | 60 - .../ultimate/smtinterpol/LogProxy.java | 105 - .../informatik/ultimate/smtinterpol/Main.java | 208 - .../smtinterpol/RandomSeedFinder.java | 64 - .../ultimate/smtinterpol/Version.java | 27 - .../ultimate/smtinterpol/Version.template | 27 - .../smtinterpol/aiger/AIGERFrontEnd.java | 426 -- .../ultimate/smtinterpol/build-version.xml | 37 - .../smtinterpol/convert/Clausifier.java | 2959 ---------- .../smtinterpol/convert/EqualityProxy.java | 207 - .../smtinterpol/convert/LogicSimplifier.java | 545 -- .../smtinterpol/convert/SMTAffineTerm.java | 354 -- .../smtinterpol/convert/TermCompiler.java | 840 --- .../smtinterpol/dimacs/DIMACSParser.java | 57 - .../ultimate/smtinterpol/dimacs/dimacs.cup | 167 - .../ultimate/smtinterpol/dimacs/dimacs.flex | 85 - .../ultimate/smtinterpol/dpll/AtomQueue.java | 165 - .../smtinterpol/dpll/BooleanVarAtom.java | 47 - .../ultimate/smtinterpol/dpll/Clause.java | 313 - .../smtinterpol/dpll/ClauseDeletionHook.java | 34 - .../ultimate/smtinterpol/dpll/DPLLAtom.java | 172 - .../ultimate/smtinterpol/dpll/DPLLEngine.java | 1917 ------ .../smtinterpol/dpll/IAnnotation.java | 37 - .../ultimate/smtinterpol/dpll/ILiteral.java | 59 - .../ultimate/smtinterpol/dpll/ITheory.java | 187 - .../ultimate/smtinterpol/dpll/Literal.java | 72 - .../ultimate/smtinterpol/dpll/NamedAtom.java | 41 - .../smtinterpol/dpll/QuantifiedAtom.java | 42 - .../ultimate/smtinterpol/dpll/SimpleList.java | 394 -- .../smtinterpol/dpll/SimpleListable.java | 83 - .../ultimate/smtinterpol/horn/HornSolver.java | 421 -- .../interpolate/ArrayInterpolator.java | 2383 -------- .../interpolate/CCInterpolator.java | 556 -- .../DatatypeCycleInterpolator.java | 452 -- .../interpolate/DatatypeInterpolator.java | 521 -- .../interpolate/EQInterpolator.java | 270 - .../interpolate/InterpolantChecker.java | 524 -- .../interpolate/InterpolantPurifier.java | 74 - .../smtinterpol/interpolate/Interpolator.java | 1859 ------ .../interpolate/InterpolatorAffineTerm.java | 154 - .../interpolate/InterpolatorAtomInfo.java | 191 - .../interpolate/InterpolatorClauseInfo.java | 193 - .../interpolate/LAInterpolator.java | 314 - .../interpolate/SymbolChecker.java | 105 - .../interpolate/SymbolCollector.java | 116 - .../model/ArraySortInterpretation.java | 203 - .../ultimate/smtinterpol/model/BidiMap.java | 266 - .../model/BitVectorInterpretation.java | 59 - .../model/BoolSortInterpretation.java | 46 - .../model/ConstantTermNormalizer.java | 80 - .../model/DataTypeInterpretation.java | 213 - .../model/FiniteSortInterpretation.java | 76 - .../smtinterpol/model/FunctionValue.java | 101 - .../ultimate/smtinterpol/model/Model.java | 342 -- .../smtinterpol/model/ModelEvaluator.java | 910 --- .../smtinterpol/model/ModelFormatter.java | 112 - .../model/NumericSortInterpretation.java | 71 - .../model/SharedTermEvaluator.java | 46 - .../smtinterpol/model/SortInterpretation.java | 59 - .../muses/ConstraintAdministrationSolver.java | 339 -- .../smtinterpol/muses/Heuristics.java | 460 -- .../smtinterpol/muses/MusContainer.java | 56 - .../muses/MusEnumerationScript.java | 738 --- .../smtinterpol/muses/MusOptions.java | 35 - .../ultimate/smtinterpol/muses/MusUtils.java | 64 - .../ultimate/smtinterpol/muses/ReMus.java | 401 -- .../ultimate/smtinterpol/muses/Shrinking.java | 254 - .../smtinterpol/muses/Translator.java | 155 - .../smtinterpol/muses/UnexploredMap.java | 227 - .../smtinterpol/option/BigIntegerOption.java | 90 - .../smtinterpol/option/BooleanOption.java | 86 - .../smtinterpol/option/ChannelOption.java | 101 - .../smtinterpol/option/DoubleOption.java | 84 - .../smtinterpol/option/EnumOption.java | 108 - .../smtinterpol/option/FrontEndOptions.java | 94 - .../smtinterpol/option/LoggerOption.java | 85 - .../smtinterpol/option/LongOption.java | 90 - .../ultimate/smtinterpol/option/Option.java | 81 - .../smtinterpol/option/OptionMap.java | 282 - .../option/SMTInterpolConstants.java | 58 - .../option/SMTInterpolOptions.java | 48 - .../smtinterpol/option/SolverOptions.java | 243 - .../smtinterpol/option/StringOption.java | 73 - .../option/StringOptionWithWarning.java | 42 - .../smtinterpol/option/VerbosityOption.java | 91 - .../proof/CongRewriteFunctionFactory.java | 89 - .../smtinterpol/proof/FixProofDAG.java | 240 - .../smtinterpol/proof/IProofTracker.java | 233 - .../ultimate/smtinterpol/proof/LeafNode.java | 99 - .../proof/MatchRewriteFunctionFactory.java | 55 - .../proof/MinimalProofChecker.java | 1448 ----- .../smtinterpol/proof/NoopProofTracker.java | 130 - .../smtinterpol/proof/OccurrenceCounter.java | 85 - .../smtinterpol/proof/Polynomial.java | 352 -- .../smtinterpol/proof/ProofConstants.java | 190 - .../smtinterpol/proof/ProofLiteral.java | 78 - .../ultimate/smtinterpol/proof/ProofNode.java | 31 - .../smtinterpol/proof/ProofRules.java | 1428 ----- .../smtinterpol/proof/ProofSimplifier.java | 5180 ----------------- .../smtinterpol/proof/ProofTermGenerator.java | 166 - .../smtinterpol/proof/ProofTracker.java | 427 -- .../smtinterpol/proof/PropProofChecker.java | 141 - .../smtinterpol/proof/RecyclePivots.java | 234 - .../smtinterpol/proof/ResolutionNode.java | 90 - .../smtinterpol/proof/SourceAnnotation.java | 90 - .../smtinterpol/proof/Transformations.java | 164 - .../smtinterpol/proof/UnitCollector.java | 139 - .../smtinterpol/proof/UnsatCoreCollector.java | 95 - .../proof/checker/CheckingScript.java | 218 - .../smtinterpol/proof/checker/Main.java | 165 - .../smtinterpol/proof/checker/proofs.cup | 906 --- .../smtinterpol/proof/checker/proofs.flex | 236 - .../smtinterpol/scripts/CopyScript.java | 31 - .../scripts/DefinitionExpander.java | 64 - .../scripts/LinearArithmeticChecker.java | 127 - .../smtinterpol/scripts/PrepareScript.java | 180 - .../smtinterpol/scripts/Reletter.java | 43 - .../scripts/TermCompilerTester.java | 58 - .../smtinterpol/scripts/Unletter.java | 41 - .../ultimate/smtinterpol/smtcomp/Prepare.java | 68 - .../ultimate/smtinterpol/smtcomp/Track.java | 51 - .../smtinterpol/smtlib/Benchmark.java | 198 - .../smtinterpol/smtlib/SMTLIBParser.java | 65 - .../ultimate/smtinterpol/smtlib/smtlib.cup | 265 - .../ultimate/smtinterpol/smtlib/smtlib.flex | 173 - .../smtinterpol/smtlib2/AssertionList.java | 59 - .../smtinterpol/smtlib2/ErrorCallback.java | 35 - .../smtinterpol/smtlib2/GetValueResult.java | 68 - .../smtlib2/InterpolationInfo.java | 100 - .../smtinterpol/smtlib2/ParseEnvironment.java | 245 - .../smtinterpol/smtlib2/SExpression.java | 85 - .../smtinterpol/smtlib2/SMTInterpol.java | 1372 ----- .../smtinterpol/smtlib2/SMTLIB2Parser.java | 40 - .../smtlib2/TerminationRequest.java | 42 - .../ultimate/smtinterpol/smtlib2/smtlib.cup | 1187 ---- .../ultimate/smtinterpol/smtlib2/smtlib.flex | 242 - .../smtinterpol/test_generator/Generator.java | 244 - .../smtinterpol/test_generator/Main.java | 157 - .../test_generator/TBenchmark.java | 129 - .../theory/bitvector/BvToIntUtils.java | 563 -- .../smtinterpol/theory/bitvector/BvUtils.java | 1238 ---- .../theory/cclosure/ArrayTheory.java | 1579 ----- .../theory/cclosure/CCAnnotation.java | 326 -- .../theory/cclosure/CCAppTerm.java | 154 - .../theory/cclosure/CCBaseTerm.java | 52 - .../theory/cclosure/CCEquality.java | 94 - .../theory/cclosure/CCParentInfo.java | 192 - .../theory/cclosure/CCProofGenerator.java | 799 --- .../smtinterpol/theory/cclosure/CCTerm.java | 725 --- .../theory/cclosure/CCTermPairHash.java | 123 - .../smtinterpol/theory/cclosure/CClosure.java | 1438 ----- .../theory/cclosure/CompareTrigger.java | 32 - .../theory/cclosure/CongruencePath.java | 409 -- .../theory/cclosure/DTReverseTrigger.java | 125 - .../theory/cclosure/DataTypeLemma.java | 130 - .../theory/cclosure/DataTypeTheory.java | 1084 ---- .../theory/cclosure/ModelBuilder.java | 293 - .../theory/cclosure/ReverseTrigger.java | 66 - .../theory/cclosure/WeakCongruencePath.java | 392 -- .../ApplyConstructiveEqualityReasoning.java | 142 - .../ApplyDestructiveEqualityReasoning.java | 178 - .../theory/epr/BinaryRelation.java | 158 - .../theory/epr/EprEqualityPredicate.java | 53 - .../smtinterpol/theory/epr/EprHelpers.java | 796 --- .../smtinterpol/theory/epr/EprPredicate.java | 301 - .../smtinterpol/theory/epr/EprTheory.java | 648 --- .../theory/epr/EprTheorySettings.java | 27 - .../theory/epr/EqualityManager.java | 138 - .../theory/epr/TTSubstitution.java | 193 - .../smtinterpol/theory/epr/TermTuple.java | 189 - .../smtinterpol/theory/epr/atoms/EprAtom.java | 80 - .../epr/atoms/EprGroundEqualityAtom.java | 90 - .../epr/atoms/EprGroundPredicateAtom.java | 71 - .../theory/epr/atoms/EprPredicateAtom.java | 46 - .../epr/atoms/EprQuantifiedEqualityAtom.java | 80 - .../epr/atoms/EprQuantifiedPredicateAtom.java | 47 - .../theory/epr/clauses/ClauseDpllLiteral.java | 67 - .../epr/clauses/ClauseEprGroundLiteral.java | 94 - .../theory/epr/clauses/ClauseEprLiteral.java | 155 - .../clauses/ClauseEprQuantifiedLiteral.java | 242 - .../theory/epr/clauses/ClauseLiteral.java | 99 - .../theory/epr/clauses/EprClause.java | 466 -- .../theory/epr/clauses/EprClauseFactory.java | 256 - .../theory/epr/clauses/EprClauseManager.java | 124 - .../theory/epr/clauses/EprClauseState.java | 33 - .../epr/clauses/UnitPropagationData.java | 81 - .../theory/epr/dawgs/DawgFactory.java | 499 -- .../epr/dawgs/dawgbuilders/DawgBuilder.java | 41 - .../dawgs/dawgbuilders/MappedDawgBuilder.java | 69 - .../dawgbuilders/ProductDawgBuilder.java | 81 - .../dawgbuilders/ProjectDawgBuilder.java | 108 - .../dawgbuilders/ReorderDawgBuilder.java | 182 - .../epr/dawgs/dawgletters/DawgLetter.java | 185 - .../dawgs/dawgletters/DawgLetterFactory.java | 84 - .../epr/dawgs/dawgstates/DawgState.java | 150 - .../dawgs/dawgstates/DawgStateFactory.java | 95 - .../DecideStackDecisionLiteral.java | 44 - .../epr/partialmodel/DecideStackEntry.java | 41 - .../DecideStackGroundLiteral.java | 128 - .../epr/partialmodel/DecideStackLiteral.java | 83 - .../DecideStackPropagatedLiteral.java | 80 - .../epr/partialmodel/EprDecideStack.java | 409 -- .../partialmodel/GroundPropagationInfo.java | 85 - .../theory/epr/util/BinaryMap.java | 103 - .../theory/epr/util/NestedMap2.java | 212 - .../theory/epr/util/NestedMap3.java | 93 - .../theory/epr/util/NestedMap4.java | 69 - .../theory/epr/util/NestedMap5.java | 116 - .../smtinterpol/theory/epr/util/Pair.java | 103 - .../smtinterpol/theory/epr/util/Triple.java | 112 - .../theory/linar/AnnotationToProofTerm.java | 224 - .../theory/linar/BoundConstraint.java | 136 - .../theory/linar/CompositeReason.java | 144 - .../smtinterpol/theory/linar/CutCreator.java | 780 --- .../theory/linar/EQAnnotation.java | 54 - .../linar/ExactInfinitesimalNumber.java | 142 - .../smtinterpol/theory/linar/Explainer.java | 203 - .../theory/linar/InfinitesimalNumber.java | 254 - .../theory/linar/LAAnnotation.java | 226 - .../smtinterpol/theory/linar/LAEquality.java | 94 - .../smtinterpol/theory/linar/LAReason.java | 142 - .../theory/linar/LASharedTerm.java | 53 - .../smtinterpol/theory/linar/LinArSolve.java | 2167 ------- .../smtinterpol/theory/linar/LinTerm.java | 64 - .../smtinterpol/theory/linar/LinVar.java | 366 -- .../theory/linar/LiteralReason.java | 114 - .../smtinterpol/theory/linar/MatrixEntry.java | 63 - .../theory/linar/MutableAffineTerm.java | 277 - .../smtinterpol/theory/linar/SOIPivoter.java | 484 -- .../smtinterpol/theory/linar/TableauxRow.java | 326 -- .../quant/DestructiveEqualityReasoning.java | 257 - .../smtinterpol/theory/quant/InstClause.java | 116 - .../theory/quant/InstantiationManager.java | 1780 ------ .../theory/quant/QuantAnnotation.java | 141 - .../theory/quant/QuantAuxEquality.java | 45 - .../theory/quant/QuantBoundConstraint.java | 43 - .../smtinterpol/theory/quant/QuantClause.java | 624 -- .../theory/quant/QuantEquality.java | 50 - .../theory/quant/QuantLiteral.java | 152 - .../smtinterpol/theory/quant/QuantUtil.java | 332 -- .../theory/quant/QuantifierTheory.java | 980 ---- .../theory/quant/SubstitutionHelper.java | 329 -- .../smtinterpol/theory/quant/dawg/Dawg.java | 652 --- .../theory/quant/ematching/CompareCode.java | 61 - .../quant/ematching/EMCompareTrigger.java | 64 - .../quant/ematching/EMReverseTrigger.java | 94 - .../theory/quant/ematching/EMatching.java | 539 -- .../theory/quant/ematching/FindCode.java | 70 - .../theory/quant/ematching/GetArgCode.java | 70 - .../theory/quant/ematching/ICode.java | 40 - .../quant/ematching/PatternCompiler.java | 310 - .../theory/quant/ematching/ReverseCode.java | 83 - .../theory/quant/ematching/YieldCode.java | 96 - .../ultimate/smtinterpol/util/ArrayMap.java | 96 - .../ultimate/smtinterpol/util/ArrayQueue.java | 138 - .../smtinterpol/util/CollectionsHelper.java | 72 - .../ultimate/smtinterpol/util/ComputeSCC.java | 116 - .../smtinterpol/util/CuckooHashSet.java | 313 - .../ultimate/smtinterpol/util/DAGSize.java | 150 - .../smtinterpol/util/FunctionalMap.java | 527 -- .../smtinterpol/util/IdentityHashSet.java | 73 - .../smtinterpol/util/IntAllocator.java | 187 - .../ultimate/smtinterpol/util/ListSet.java | 218 - .../ultimate/smtinterpol/util/Polynomial.java | 362 -- .../smtinterpol/util/ResourceLimit.java | 74 - .../smtinterpol/util/ScopedArrayList.java | 79 - .../util/ScopedIdentityHashMap.java | 313 - .../smtinterpol/util/ScopedLinkedHashMap.java | 207 - .../smtinterpol/util/ScopedLinkedHashSet.java | 143 - .../ultimate/smtinterpol/util/SharingSet.java | 163 - .../smtinterpol/util/SymmetricPair.java | 54 - .../ultimate/smtinterpol/util/TermUtils.java | 42 - .../smtinterpol/util/TimeoutHandler.java | 69 - trunk/source/SMTInterpolTest/.classpath | 7 - trunk/source/SMTInterpolTest/.project | 38 - .../SMTInterpolTest/META-INF/MANIFEST.MF | 12 - trunk/source/SMTInterpolTest/build.properties | 3 - trunk/source/SMTInterpolTest/pom.xml | 42 - .../epr/dawgs/DawgTestDawgLetters.java | 82 - .../epr/dawgs/DawgTestProjectColumnAway.java | 97 - .../ultimate/epr/dawgs/DawgTestReorder.java | 123 - .../epr/dawgs/DawgTestSetOperations.java | 277 - .../dawgs/DawgTestSignatureTranslations.java | 147 - .../epr/dawgs/DawgTestSymmTransClosure.java | 105 - .../ultimate/epr/dawgs/EprTestHelpers.java | 67 - .../smtinterpol/convert/CompilerTest.java | 81 - .../smtinterpol/convert/IntDivideTest.java | 100 - .../convert/StablyInfiniteTest.java | 229 - .../smtinterpol/convert/TermCompilerTest.java | 211 - .../convert/TerminationRequestTest.java | 47 - .../ultimate/smtinterpol/dpll/AllSatTest.java | 64 - .../smtinterpol/dpll/Incremental.java | 78 - .../smtinterpol/dpll/SimpleListTest.java | 218 - .../interpolate/EqInterpolatorIntTest.java | 264 - .../interpolate/EqInterpolatorRealTest.java | 177 - .../ultimate/smtinterpol/model/ModelTest.java | 623 -- .../ultimate/smtinterpol/muses/MusesTest.java | 2135 ------- .../proof/ProofSimplifierTest.java | 713 --- .../ultimate/smtinterpol/proof/RPITest.java | 366 -- .../ultimate/smtinterpol/smtlib2/APITest.java | 396 -- .../smtinterpol/smtlib2/AssumptionTest.java | 181 - .../theory/bitvector/BitvectorTest.java | 1213 ---- .../theory/cclosure/CongruentAddTest.java | 233 - .../theory/cclosure/PairHashTest.java | 99 - .../smtinterpol/theory/linar/EpsilonTest.java | 178 - .../smtinterpol/util/FunctionalMapTest.java | 151 - .../src/system/SystemTest.java | 202 - .../test/abv/indexInRange01.smt2 | 17 - .../SMTInterpolTest/test/array/const001.smt2 | 13 - .../SMTInterpolTest/test/array/const002.smt2 | 17 - .../SMTInterpolTest/test/array/const003.smt2 | 20 - .../SMTInterpolTest/test/array/const004.smt2 | 17 - .../SMTInterpolTest/test/array/const005.smt2 | 16 - .../SMTInterpolTest/test/array/const006.smt2 | 20 - .../SMTInterpolTest/test/array/const007.smt2 | 15 - .../SMTInterpolTest/test/array/const008.smt2 | 18 - .../SMTInterpolTest/test/array/const009.smt2 | 20 - .../SMTInterpolTest/test/array/const010.smt2 | 15 - .../SMTInterpolTest/test/array/const011.smt2 | 24 - .../SMTInterpolTest/test/array/const012.smt2 | 23 - .../SMTInterpolTest/test/array/const013.smt2 | 21 - .../SMTInterpolTest/test/array/const014.smt2 | 16 - .../SMTInterpolTest/test/array/const015.smt2 | 18 - .../SMTInterpolTest/test/array/const016.smt2 | 19 - .../test/array/difftest001.smt2 | 12 - .../test/array/difftest002.smt2 | 14 - .../test/array/difftest003.smt2 | 13 - .../test/array/difftest004.smt2 | 14 - .../SMTInterpolTest/test/bv/bvand01.smt2 | 15 - .../SMTInterpolTest/test/bv/bvand02.smt2 | 15 - .../SMTInterpolTest/test/bv/bvand03.smt2 | 15 - .../SMTInterpolTest/test/bv/bvcompare.smt2 | 12 - .../SMTInterpolTest/test/bv/bvshl01.smt2 | 23 - .../SMTInterpolTest/test/bv/bvsignextend.smt2 | 24 - .../SMTInterpolTest/test/bv/bvzeroextend.smt2 | 23 - .../SMTInterpolTest/test/bv/test01.smt2 | 16 - .../SMTInterpolTest/test/bv/test02.smt2 | 17 - .../SMTInterpolTest/test/bv/test03.smt2 | 18 - .../SMTInterpolTest/test/bv/test04.smt2 | 21 - .../SMTInterpolTest/test/datatype/cycle.smt2 | 16 - .../test/datatype/cycle_1.smt2 | 21 - .../test/datatype/cycle_2.smt2 | 20 - .../test/datatype/cycle_3.smt2 | 19 - .../test/datatype/datatype.smt2 | 10 - .../test/datatype/datatype_2.smt2 | 18 - .../test/datatype/datatype_3.smt2 | 18 - .../test/datatype/datatype_4.smt2 | 18 - .../test/datatype/datatype_5.smt2 | 20 - .../test/datatype/datatype_6.smt2 | 18 - .../test/datatype/datatype_7.smt2 | 21 - .../test/datatype/datatype_8.smt2 | 20 - .../test/datatype/generic_datatype.smt2 | 16 - .../test/datatype/match_1.smt2 | 18 - .../test/datatype/match_2.smt2 | 18 - .../test/datatype/match_3.smt2 | 18 - .../test/datatype/match_4.smt2 | 18 - .../test/datatype/match_5.smt2 | 19 - .../test/datatype/model/almost_cycle.smt2 | 22 - .../test/datatype/model/datatype_2.smt2 | 20 - .../test/datatype/model/datatype_3.smt2 | 20 - .../quantified/generic_match_test.smt2 | 22 - .../test/datatype/quantified/match_test.smt2 | 25 - .../datatype/quantified/match_test_2.smt2 | 26 - .../datatype/quantified/match_test_3.smt2 | 26 - .../datatype/quantified/match_test_4.smt2 | 26 - .../quantified/quoted_match_test.smt2 | 22 - .../epr-equality-eliminated/emptyTest.smt2 | 13 - .../eprtest-orr-sll-deleteAll.imp-1.smt2 | 42 - .../eprtest-orr-sll-deleteAll.imp-2.smt2 | 42 - .../eprtest-orr-sll-find.imp-001.smt2 | 37 - .../eprtest-orr-sll-find.imp-002.smt2 | 37 - .../eprtest-orr-sll-insert-safety.imp-1.smt2 | 35 - .../eprtest-orr-sll-insert-safety.imp-2.smt2 | 36 - .../eprtest-orr-sll-last-uv.imp-1.smt2 | 37 - .../eprtest-orr-sll-last-uv.imp-2.smt2 | 37 - .../eprtest-orr-sll-last.imp-001.smt2 | 33 - .../eprtest-orr-sll-last.imp-002.smt2 | 32 - .../eprtest-orr-sll-reverse.imp-1.smt2 | 41 - .../eprtest-orr-sll-reverse.imp-2.smt2 | 42 - .../eprtest-orr-sll-swap.imp-1.smt2 | 42 - .../epr-equality-eliminated/eprtest001.smt2 | 22 - .../epr-equality-eliminated/eprtest002.smt2 | 21 - .../eprtest-orr-csll-is_h_on_cycle.imp-1.smt2 | 55 - .../eprtest-orr-csll-is_h_on_cycle.imp-2.smt2 | 55 - .../SMTInterpolTest/test/epr/emptyTest.smt2 | 13 - .../epr/eprtest-orr-sll-deleteAll.imp-1.smt2 | 42 - .../epr/eprtest-orr-sll-deleteAll.imp-2.smt2 | 42 - .../epr/eprtest-orr-sll-find.imp-001.smt2 | 37 - .../epr/eprtest-orr-sll-find.imp-002.smt2 | 37 - .../eprtest-orr-sll-insert-safety.imp-1.smt2 | 35 - .../eprtest-orr-sll-insert-safety.imp-2.smt2 | 36 - .../epr/eprtest-orr-sll-last.imp-001.smt2 | 33 - .../epr/eprtest-orr-sll-last.imp-002.smt2 | 32 - .../epr/eprtest-orr-sll-reverse.imp-1.smt2 | 41 - .../epr/eprtest-orr-sll-reverse.imp-2.smt2 | 42 - .../test/epr/eprtest-orr-sll-swap.imp-1.smt2 | 42 - .../SMTInterpolTest/test/epr/eprtest001.smt2 | 22 - .../SMTInterpolTest/test/epr/eprtest002.smt2 | 21 - .../test/epr/stratified_functions_01.smt2 | 24 - .../test/epr/stratified_functions_02.smt2 | 22 - .../test/epr/stratified_functions_03.smt2 | 21 - .../eprtest-orr-sll-last-uv.imp-1.smt2 | 36 - .../eprtest-orr-sll-last-uv.imp-2.smt2 | 36 - .../test/interpolation/arrayclosetest001.smt2 | 27 - .../test/interpolation/arrayclosetest002.smt2 | 27 - .../test/interpolation/arrayclosetest003.smt2 | 37 - .../test/interpolation/arrayclosetest004.smt2 | 29 - .../test/interpolation/arrayclosetest005.smt2 | 29 - .../test/interpolation/arraytest001.smt2 | 28 - .../test/interpolation/arraytest002.smt2 | 28 - .../test/interpolation/arraytest003.smt2 | 29 - .../test/interpolation/arraytest004.smt2 | 32 - .../test/interpolation/arraytest005.smt2 | 32 - .../test/interpolation/arraytest006.smt2 | 29 - .../test/interpolation/arraytest007.smt2 | 29 - .../test/interpolation/arraytest008.smt2 | 29 - .../test/interpolation/arraytest009.smt2 | 29 - .../test/interpolation/arraytest010.smt2 | 39 - .../test/interpolation/arraytest011.smt2 | 39 - .../test/interpolation/arraytest012.smt2 | 39 - .../test/interpolation/arraytest013.smt2 | 39 - .../test/interpolation/arraytreetest001.smt2 | 44 - .../test/interpolation/arraytreetest002.smt2 | 43 - .../test/interpolation/arraytreetest003.smt2 | 46 - .../test/interpolation/cctest001.smt2 | 20 - .../test/interpolation/cctest002.smt2 | 28 - .../test/interpolation/cctest003.smt2 | 13 - .../test/interpolation/constarr001.smt2 | 19 - .../test/interpolation/constarr002.smt2 | 22 - .../test/interpolation/constarr003.smt2 | 23 - .../test/interpolation/constarr004.smt2 | 29 - .../test/interpolation/constarr005.smt2 | 29 - .../test/interpolation/constarr006.smt2 | 28 - .../test/interpolation/constarr007.smt2 | 20 - .../test/interpolation/constarr008.smt2 | 22 - .../test/interpolation/constarr009.smt2 | 32 - .../test/interpolation/constarr010.smt2 | 32 - .../test/interpolation/constarr011.smt2 | 35 - .../test/interpolation/constarr012.smt2 | 45 - .../test/interpolation/constarr013.smt2 | 45 - .../test/interpolation/constarr014.smt2 | 47 - .../interpolation/datatype/dt_cases001.smt2 | 27 - .../interpolation/datatype/dt_cases002.smt2 | 26 - .../interpolation/datatype/dt_cases003.smt2 | 34 - .../interpolation/datatype/dt_cases004.smt2 | 34 - .../interpolation/datatype/dt_cases005.smt2 | 34 - .../datatype/dt_constructor001.smt2 | 28 - .../datatype/dt_constructor002.smt2 | 32 - .../interpolation/datatype/dt_cycle001.smt2 | 26 - .../interpolation/datatype/dt_cycle002.smt2 | 29 - .../interpolation/datatype/dt_cycle003.smt2 | 29 - .../interpolation/datatype/dt_cycle004.smt2 | 29 - .../interpolation/datatype/dt_cycle005.smt2 | 29 - .../interpolation/datatype/dt_cycle006.smt2 | 35 - .../interpolation/datatype/dt_cycle007.smt2 | 40 - .../interpolation/datatype/dt_cycle008.smt2 | 23 - .../datatype/dt_disjoint001.smt2 | 28 - .../datatype/dt_disjoint002.smt2 | 38 - .../datatype/dt_disjoint003.smt2 | 28 - .../datatype/dt_disjoint004.smt2 | 28 - .../datatype/dt_disjoint005.smt2 | 28 - .../datatype/dt_injective001.smt2 | 29 - .../datatype/dt_injective002.smt2 | 29 - .../datatype/dt_injective003.smt2 | 41 - .../datatype/dt_injective004.smt2 | 36 - .../interpolation/datatype/dt_project001.smt2 | 27 - .../interpolation/datatype/dt_project002.smt2 | 27 - .../interpolation/datatype/dt_project003.smt2 | 35 - .../interpolation/datatype/dt_project004.smt2 | 33 - .../interpolation/datatype/dt_project005.smt2 | 46 - .../interpolation/datatype/dt_project006.smt2 | 35 - .../interpolation/datatype/dt_project007.smt2 | 29 - .../datatype/dt_project_error.smt2 | 33 - .../interpolation/datatype/dt_tester001.smt2 | 28 - .../interpolation/datatype/dt_tester002.smt2 | 27 - .../interpolation/datatype/dt_tester003.smt2 | 28 - .../interpolation/datatype/dt_tester004.smt2 | 27 - .../interpolation/datatype/dt_tester005.smt2 | 29 - .../interpolation/datatype/dt_tester006.smt2 | 29 - .../interpolation/datatype/dt_unique001.smt2 | 28 - .../interpolation/datatype/dt_unique002.smt2 | 27 - .../interpolation/datatype/dt_unique003.smt2 | 28 - .../interpolation/datatype/dt_unique004.smt2 | 28 - .../interpolation/datatype/dt_unique005.smt2 | 28 - .../interpolation/datatype/dt_unique006.smt2 | 34 - .../test/interpolation/ipltst.smt2 | 17 - .../test/interpolation/ipltst1.smt2 | 10 - .../test/interpolation/ipltst2.smt | 13 - .../test/interpolation/ipltst2.smt2 | 13 - .../test/interpolation/ipltst3.smt2 | 17 - .../test/interpolation/liatest001.smt2 | 12 - .../test/interpolation/liatest002.smt2 | 16 - .../test/interpolation/mccarthy1.smt2 | 76 - .../test/interpolation/mccarthy2.smt2 | 38 - .../test/interpolation/treetest001.smt2 | 24 - .../test/interpolation/treetest002.smt2 | 24 - .../test/interpolation/trivdiseq001.smt2 | 16 - .../test/interpolation/trivdiseq002.smt2 | 19 - .../test/interpolation/trivdiseq003.smt2 | 21 - .../test/interpolation/ufliatest001.smt2 | 25 - .../test/interpolation/ufliatest002.smt2 | 25 - .../test/interpolation/ufliatest003.smt2 | 27 - .../test/interpolation/ufliatest004.smt2 | 11 - .../test/interpolation/uflratest001.smt2 | 25 - .../test/interpolation/uflratest002.smt2 | 25 - .../test/interpolation/uflratest003.smt2 | 27 - .../test/interpolation/uflratest004.smt2 | 27 - .../test/interpolation/uflratest005.smt2 | 33 - .../test/interpolation/weakeqext001.smt2 | 45 - .../SMTInterpolTest/test/lia/divdiv1.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv2.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv3.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv4.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv5.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv6.smt2 | 8 - .../SMTInterpolTest/test/lia/divdiv7.smt2 | 8 - .../SMTInterpolTest/test/lia/divtest001.smt2 | 8 - .../SMTInterpolTest/test/lia/divtest003.smt2 | 8 - .../test/lia/tightrhombus-273-245-0.smt2 | 15 - .../test/lia/tightrhombus-273-245-1.smt2 | 15 - .../test/lia/tightrhombus-273-245-10.smt2 | 15 - .../test/lia/tightrhombus-273-245-2.smt2 | 15 - .../test/lia/tightrhombus-273-245-3.smt2 | 17 - .../test/lia/tightrhombus-273-245-4.smt2 | 15 - .../test/lia/tightrhombus-273-245-5.smt2 | 15 - .../test/lia/tightrhombus-273-245-6.smt2 | 15 - .../test/lia/tightrhombus-273-245-7.smt2 | 15 - .../test/lia/tightrhombus-273-245-8.smt2 | 15 - .../test/lia/tightrhombus-273-245-9.smt2 | 17 - .../test/lia/tightrhombus-283-245-0.smt2 | 15 - .../test/lia/tightrhombus-283-245-1.smt2 | 15 - .../test/lia/tightrhombus-283-245-10.smt2 | 15 - .../test/lia/tightrhombus-283-245-2.smt2 | 15 - .../test/lia/tightrhombus-283-245-3.smt2 | 17 - .../test/lia/tightrhombus-283-245-4.smt2 | 15 - .../test/lia/tightrhombus-283-245-5.smt2 | 15 - .../test/lia/tightrhombus-283-245-6.smt2 | 15 - .../test/lia/tightrhombus-283-245-7.smt2 | 15 - .../test/lia/tightrhombus-283-245-8.smt2 | 15 - .../test/lia/tightrhombus-283-245-9.smt2 | 15 - .../10-vars/cut_lemma_01_001-a.smt2 | 15 - .../10-vars/cut_lemma_01_001-b.smt2 | 15 - .../10-vars/cut_lemma_02_001-a.smt2 | 20 - .../10-vars/cut_lemma_02_001-b.smt2 | 20 - .../10-vars/cut_lemma_02_003-a.smt2 | 20 - .../20-vars/cut_lemma_01_002-a.smt2 | 31 - .../20-vars/cut_lemma_01_002-b.smt2 | 31 - .../test/lira/shareintreal.smt2 | 18 - .../test/lira/tightrhombus-273-245-4-sat.smt2 | 16 - .../lira/tightrhombus-273-245-4-satmod.smt2 | 18 - .../lira/tightrhombus-273-245-4-unsat.smt2 | 16 - .../lira/tightrhombus-273-245-4b-sat.smt2 | 17 - .../lira/tightrhombus-273-245-4b-unsat.smt2 | 17 - .../test/lira/tightrhombus-283-245-4-sat.smt2 | 17 - .../lira/tightrhombus-283-245-4-unsat.smt2 | 16 - .../test/lira/tightrhombus-283-245-4.smt2 | 16 - .../tightrhombus-lira-273-245-10-sat.smt2 | 17 - .../tightrhombus-lira-273-245-10-unsat.smt2 | 17 - .../lira/tightrhombus-lira-273-245-8-sat.smt2 | 17 - .../tightrhombus-lira-273-245-8-unsat.smt2 | 17 - .../lira/tightrhombus-lira-273-245-9-sat.smt2 | 17 - .../tightrhombus-lira-273-245-9-unsat.smt2 | 17 - .../tightrhombus-lira-283-245-10-sat.smt2 | 17 - .../tightrhombus-lira-283-245-10-unsat.smt2 | 18 - .../lira/tightrhombus-lira-283-245-4-sat.smt2 | 17 - .../tightrhombus-lira-283-245-4-unsat.smt2 | 17 - .../lira/tightrhombus-lira-283-245-8-sat.smt2 | 17 - .../tightrhombus-lira-283-245-8-unsat.smt2 | 17 - .../lira/tightrhombus-lira-283-245-9-sat.smt2 | 18 - .../tightrhombus-lira-283-245-9-unsat.smt2 | 18 - .../20120307BugAssertInLinArSolve.smt2.gz | Bin 296 -> 0 bytes ...0120309-BugIntegerlInterpolation-1.smt2.gz | Bin 1503 -> 0 bytes ...20120310-BugColorMixedOccurrence01.smt2.gz | Bin 2664 -> 0 bytes ...20120310-BugColorMixedOccurrence02.smt2.gz | Bin 14475 -> 0 bytes ...20120310-BugColorMixedOccurrence03.smt2.gz | Bin 5294 -> 0 bytes ...20120310-BugColorMixedOccurrence04.smt2.gz | Bin 158201 -> 0 bytes ...20310-BugInterpolantNotInductive01.smt2.gz | Bin 2890 -> 0 bytes ...20310-BugInterpolantNotInductive02.smt2.gz | Bin 5940 -> 0 bytes ...0120311-Bug-computeEQInterpolant01.smt2.gz | Bin 376 -> 0 bytes ...0120311-Bug-computeEQInterpolant02.smt2.gz | Bin 2387 -> 0 bytes .../20120311-Bug-computeFreeVars01.smt2.gz | Bin 10341 -> 0 bytes .../20120311-Bug-interpolateLeafs01.smt2.gz | Bin 5812 -> 0 bytes .../20120311-Bug-interpolateLeafs02.smt2.gz | Bin 261 -> 0 bytes ...g-InterpolatorAffineTerm.toLeq0-01.smt2.gz | Bin 89251 -> 0 bytes .../20120322-BugAffineTermAssert.smt2 | 607 -- ...rpolatorAffineTerm.toLeq0-original.smt2.gz | Bin 141790 -> 0 bytes ...AffineTerm.toLeq0-push-pop-removed.smt2.gz | Bin 1386 -> 0 bytes .../20120324Bug-checkBrpCounters01.smt.gz | Bin 1374 -> 0 bytes .../20120324Bug-checkBrpCounters02.smt.gz | Bin 651 -> 0 bytes .../20120324Bug-computeEpsilon01.smt.gz | Bin 323 -> 0 bytes .../SMTInterpolTest/test/model/array001.smt2 | 9 - .../SMTInterpolTest/test/model/array002.smt2 | 13 - .../SMTInterpolTest/test/model/array003.smt2 | 13 - .../SMTInterpolTest/test/model/buggy001.smt2 | 407 -- .../SMTInterpolTest/test/nia/divaxiom1.smt2 | 26 - .../SMTInterpolTest/test/nia/divaxiom2.smt2 | 61 - .../SMTInterpolTest/test/nia/modaxiom.smt2 | 28 - .../proof/auxaxioms/array_bruttomesso.smt2 | 20 - .../test/proof/auxaxioms/array_diff.smt2 | 14 - .../auxaxioms/array_selectoverstore.smt2 | 19 - .../auxaxioms/array_sos_withfunction.smt2 | 22 - .../test/proof/auxaxioms/array_store.smt2 | 15 - .../test/proof/auxaxioms/array_weakeqext.smt2 | 21 - .../proof/auxaxioms/array_weakeqext_001.smt2 | 26 - .../array_weakeqext_withfunction.smt2 | 27 - .../proof/auxaxioms/array_withfunction.smt2 | 16 - .../test/proof/auxaxioms/div_high.smt2 | 11 - .../test/proof/auxaxioms/div_low.smt2 | 11 - .../test/proof/auxaxioms/eq_neg_1.smt2 | 22 - .../test/proof/auxaxioms/eq_neg_2.smt2 | 22 - .../test/proof/auxaxioms/eq_pos_1.smt2 | 22 - .../test/proof/auxaxioms/eq_pos_2.smt2 | 22 - .../test/proof/auxaxioms/excluded_middle.smt2 | 25 - .../test/proof/auxaxioms/ite_neg_1.smt2 | 22 - .../test/proof/auxaxioms/ite_neg_2.smt2 | 22 - .../test/proof/auxaxioms/ite_neg_red.smt2 | 22 - .../test/proof/auxaxioms/ite_pos_1.smt2 | 22 - .../test/proof/auxaxioms/ite_pos_2.smt2 | 22 - .../test/proof/auxaxioms/ite_pos_red.smt2 | 22 - .../test/proof/auxaxioms/or_neg.smt2 | 17 - .../test/proof/auxaxioms/or_pos.smt2 | 47 - .../test/proof/auxaxioms/term_ite.smt2 | 47 - .../test/proof/auxaxioms/to_int_high.smt2 | 20 - .../test/proof/auxaxioms/to_int_low.smt2 | 22 - .../test/proof/auxaxioms/true_not_false.smt2 | 12 - .../test/proof/cclemma/trivialdiseq.smt2 | 12 - .../test/proof/cclemma/trivialdiseqarray.smt2 | 14 - .../test/proof/datatype/dt_cases_1.smt2 | 16 - .../test/proof/datatype/dt_constructor_1.smt2 | 20 - .../test/proof/datatype/dt_constructor_2.smt2 | 20 - .../test/proof/datatype/dt_cycle_1.smt2 | 18 - .../test/proof/datatype/dt_cycle_2.smt2 | 24 - .../test/proof/datatype/dt_cycle_3.smt2 | 22 - .../test/proof/datatype/dt_disjoint_1.smt2 | 18 - .../test/proof/datatype/dt_disjoint_2.smt2 | 19 - .../test/proof/datatype/dt_injective_1.smt2 | 22 - .../test/proof/datatype/dt_injective_2.smt2 | 22 - .../test/proof/datatype/dt_injective_3.smt2 | 22 - .../test/proof/datatype/dt_match_1.smt2 | 18 - .../test/proof/datatype/dt_match_2.smt2 | 20 - .../test/proof/datatype/dt_match_3.smt2 | 22 - .../test/proof/datatype/dt_match_4.smt2 | 21 - .../test/proof/datatype/dt_match_5.smt2 | 24 - .../test/proof/datatype/dt_match_6.smt2 | 24 - .../test/proof/datatype/dt_match_bool_1.smt2 | 18 - .../test/proof/datatype/dt_match_bool_2.smt2 | 20 - .../test/proof/datatype/dt_match_bool_3.smt2 | 22 - .../test/proof/datatype/dt_match_bool_4.smt2 | 21 - .../test/proof/datatype/dt_match_bool_5.smt2 | 24 - .../test/proof/datatype/dt_match_bool_6.smt2 | 24 - .../test/proof/datatype/dt_match_gen_1.smt2 | 18 - .../test/proof/datatype/dt_match_gen_2.smt2 | 20 - .../test/proof/datatype/dt_match_gen_3.smt2 | 22 - .../test/proof/datatype/dt_match_gen_4.smt2 | 21 - .../test/proof/datatype/dt_match_gen_5.smt2 | 24 - .../test/proof/datatype/dt_match_gen_6.smt2 | 24 - .../test/proof/datatype/dt_project_1.smt2 | 14 - .../test/proof/datatype/dt_project_2.smt2 | 13 - .../test/proof/datatype/dt_project_int_1.smt2 | 13 - .../test/proof/datatype/dt_project_int_2.smt2 | 12 - .../test/proof/datatype/dt_tester_1.smt2 | 14 - .../test/proof/datatype/dt_tester_2.smt2 | 14 - .../test/proof/datatype/dt_tester_3.smt2 | 12 - .../test/proof/datatype/dt_tester_4.smt2 | 12 - .../test/proof/datatype/dt_unique_1.smt2 | 17 - .../test/proof/quantaux/aux_forall.smt2 | 16 - .../test/proof/rewrite/and_rewrite.smt2 | 23 - .../test/proof/rewrite/div.smt2 | 75 - .../test/proof/rewrite/divisible.smt2 | 27 - .../test/proof/rewrite/divreal.smt2 | 25 - .../test/proof/rewrite/expand.smt2 | 74 - .../test/proof/rewrite/imp_rewrite.smt2 | 27 - .../test/proof/rewrite/leq_false.smt2 | 25 - .../test/proof/rewrite/leq_true.smt2 | 25 - .../test/proof/rewrite/match_rewrite.smt2 | 19 - .../test/proof/rewrite/mod.smt2 | 87 - .../test/proof/rewrite/mul.smt2 | 44 - .../test/proof/rewrite/or_simp.smt2 | 39 - .../test/proof/rewrite/or_taut.smt2 | 27 - .../test/proof/rewrite/plus.smt2 | 52 - .../test/proof/rewrite/select_over_store.smt2 | 24 - .../test/proof/rewrite/store_over_store.smt2 | 17 - .../test/proof/rewrite/store_rewrite.smt2 | 24 - .../test/proof/rewrite/to_int.smt2 | 37 - .../test/proof/rewrite/to_leq0.smt2 | 32 - .../test/proof/rewrite/xor_notnot.smt2 | 10 - .../test/proof/rewrite/xor_rewrite.smt2 | 17 - .../test/proof/split/iteminus.smt2 | 28 - .../test/proof/split/iteplus.smt2 | 28 - .../test/proof/split/notor.smt2 | 17 - .../test/proof/split/xorminus.smt2 | 28 - .../test/proof/split/xorplus.smt2 | 28 - ...heck_heap_access_38_4_interpolation_1.smt2 | 1129 ---- ...heck_heap_access_38_4_interpolation_2.smt2 | 1129 ---- ...heck_heap_access_38_4_interpolation_4.smt2 | 1129 ---- ...ion_of_dl_insert_17_4_interpolation_1.smt2 | 434 -- ...ion_of_dl_insert_17_4_interpolation_3.smt2 | 434 -- ...emove_check_free_49_4_interpolation_1.smt2 | 1070 ---- ...emove_check_free_49_4_interpolation_2.smt2 | 1070 ---- ...emove_check_free_49_4_interpolation_3.smt2 | 1070 ---- ...emove_check_free_49_4_interpolation_4.smt2 | 1070 ---- ...emove_check_free_49_4_interpolation_5.smt2 | 1070 ---- ...heck_heap_access_38_4_interpolation_4.smt2 | 805 --- ...ck_heap_access_40_6_1_interpolation_1.smt2 | 809 --- ...n_of_dl_traverse_24_1_interpolation_2.smt2 | 1026 ---- ...n_of_dl_traverse_24_1_interpolation_4.smt2 | 1026 ---- ...heck_heap_access_26_4_interpolation_3.smt2 | 517 -- ...on_of_rec_concat_31_1_interpolation_5.smt2 | 483 -- ...of_rec_copy_loop_38_4_interpolation_1.smt2 | 566 -- ...of_rec_copy_loop_38_4_interpolation_4.smt2 | 566 -- ...of_rec_copy_loop_38_4_interpolation_5.smt2 | 566 -- ...dition_of_remove_33_4_interpolation_4.smt2 | 624 -- ...ition_of_reverse_26_1_interpolation_2.smt2 | 574 -- ...heck_heap_access_40_4_interpolation_1.smt2 | 1045 ---- .../quantified-interpolation/quant001.smt2 | 32 - .../quantified-interpolation/quant002.smt2 | 27 - .../quantified-interpolation/quant003.smt2 | 35 - .../quanttreetest001.smt2 | 36 - .../ArrayInitialization02.bplJordan.smt2 | 50 - .../test/quantified/arrayext001.smt2 | 17 - .../test/quantified/arrayext002.smt2 | 18 - .../test/quantified/arrayext003.smt2 | 18 - .../test/quantified/quanttest001.smt2 | 14 - .../test/quantified/quanttest002.smt2 | 13 - .../test/quantified/quanttest003.smt2 | 13 - .../test/quantified/quanttest004.smt2 | 17 - .../test/quantified/quanttest005.smt2 | 12 - .../test/quantified/quanttest006.smt2 | 16 - .../test/quantified/quanttest007.smt2 | 11 - .../test/quantified/quanttest008.smt2 | 18 - .../test/quantified/quanttest009.smt2 | 12 - .../test/quantified/quanttest010.smt2 | 14 - ...track.i_AllErrorsAtOnce_12_TraceCheck.smt2 | 196 - .../20190906-CLEARSY-0012-00092-check30.smt2 | 567 -- .../Script_eureka_05_simplified_1.smt2 | 36 - ...unreach-call_false-valid-memtrack.i_2.smt2 | 97 - ...pped_true-unreach-call.i_6.simplified.smt2 | 18 - .../test/regression/add_excluded_middle1.smt2 | 10 - .../test/regression/add_excluded_middle2.smt2 | 10 - .../regression/add_excluded_middle_bug.smt2 | 14 - .../SMTInterpolTest/test/regression/pop2.smt2 | 11 - .../test/regression/smtfuzz/1523.smt2 | 592 -- .../test/regression/smtfuzz/1567.smt2 | 426 -- .../test/regression/smtfuzz/1576.smt2 | 1179 ---- .../test/regression/smtfuzz/1776.smt2 | 149 - .../test/regression/smtfuzz/1875.smt2 | 244 - .../test/regression/smtfuzz/191.smt2 | 120 - .../test/regression/smtfuzz/1917.smt2 | 178 - .../test/regression/smtfuzz/201.smt2 | 220 - .../test/regression/smtfuzz/235.smt2 | 92 - .../test/regression/smtfuzz/751.smt2 | 321 - .../test/regression/smtfuzz/array2.smt2 | 367 -- .../test/regression/smtfuzz/arridx.smt2 | 369 -- .../test/regression/smtfuzz/cast.smt2 | 177 - .../test/regression/smtfuzz/cast1.smt2 | 159 - .../test/regression/smtfuzz/cast2.smt2 | 94 - .../test/regression/smtfuzz/ematching.smt2 | 328 -- .../test/regression/smtfuzz/interpol.smt2 | 356 -- .../test/regression/smtfuzz/issue101.smt2 | 175 - .../test/regression/smtfuzz/issue102.smt2 | 271 - .../test/regression/smtfuzz/issue103.smt2 | 156 - .../regression/smtfuzz/issue104.smt2.slow | 3204 ---------- .../test/regression/smtfuzz/issue50.smt2 | 25 - .../test/regression/smtfuzz/issue51.smt2 | 39 - .../test/regression/smtfuzz/issue52.smt2 | 27 - .../test/regression/smtfuzz/issue53.smt2 | 24 - .../test/regression/smtfuzz/issue54.smt2 | 7 - .../test/regression/smtfuzz/issue55.smt2 | 9 - .../test/regression/smtfuzz/issue56.smt2 | 13 - .../test/regression/smtfuzz/issue57.smt2 | 10 - .../test/regression/smtfuzz/issue58.smt2 | 10 - .../test/regression/smtfuzz/issue77_npe.smt2 | 1086 ---- .../test/regression/smtfuzz/issue83.smt2 | 6 - .../regression/smtfuzz/issue86_unsatcore.smt2 | 33 - .../test/regression/smtfuzz/issue87.smt2 | 73 - .../test/regression/smtfuzz/issue92-1.smt2 | 352 -- .../test/regression/smtfuzz/issue94.smt2 | 160 - .../test/regression/smtfuzz/issue97-1.smt2 | 142 - .../test/regression/smtfuzz/issue97-2.smt2 | 76 - .../test/regression/smtfuzz/issue97-3.smt2 | 145 - .../test/regression/smtfuzz/issue98.smt2 | 315 - .../test/regression/smtfuzz/issue99-2.smt2 | 106 - .../test/regression/smtfuzz/issue99.smt2 | 215 - .../test/regression/smtfuzz/npe1.smt2 | 176 - .../test/regression/smtfuzz/npe2.smt2 | 104 - .../test/regression/smtfuzz/npe3.smt2 | 149 - .../simplify/simplify-interpolants.smt2.bz2 | Bin 90708 -> 0 bytes .../test/simplify/simplify.smt2 | 22 - .../test/simplify/simplifyContext.smt2 | 8 - .../SMTInterpolTest/test/ufbv/ufbv01.smt2 | 17 - .../test/uflira/uflira_001.smt2 | 11 - .../test/uflira/uflira_002.smt2 | 13 - .../test/uflira/uflira_003.smt2 | 15 - .../test/uflira/uflira_004.smt2 | 12 - .../test/uflira/uflira_005.smt2 | 10 - 877 files changed, 144632 deletions(-) delete mode 100644 trunk/source/Library-SMTLIB/.classpath delete mode 100644 trunk/source/Library-SMTLIB/.project delete mode 100644 trunk/source/Library-SMTLIB/META-INF/MANIFEST.MF delete mode 100644 trunk/source/Library-SMTLIB/build.properties delete mode 100644 trunk/source/Library-SMTLIB/pom.xml delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/AnnotatedTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Annotation.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ApplicationTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Assignments.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/CheckClosedTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ComputeFreeVariables.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ConstantTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/DataType.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaLet.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaUnLet.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaWalker.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbol.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbolFactory.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/INonSolverScript.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAConstantFormatter.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAWrapperFactory.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IsConstructorFactory.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LambdaTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LetTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LoggingScript.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Logics.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MatchTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Model.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MutableRational.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NonRecursive.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NoopScript.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/OccurrenceCounter.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PolymorphicFunctionSymbol.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PrintTerm.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuantifiedFormula.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuotedObject.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Rational.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ReasonUnknown.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBConstants.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBException.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Script.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Sort.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SortSymbol.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Term.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermEquivalence.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermTransformer.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermVariable.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Theory.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Util.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/WrapperScript.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/simplification/PushPopChecker.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/simplification/SimplifyDDA.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/util/DebugMessage.java delete mode 100644 trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/util/PushPopChecker.java delete mode 100644 trunk/source/Library-SMTLIBTest/.classpath delete mode 100644 trunk/source/Library-SMTLIBTest/.project delete mode 100644 trunk/source/Library-SMTLIBTest/META-INF/MANIFEST.MF delete mode 100644 trunk/source/Library-SMTLIBTest/build.properties delete mode 100644 trunk/source/Library-SMTLIBTest/pom.xml delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/FunctionTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/LetTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/LogicTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/ModelValueTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/MutableRationalTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/PrintTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/RationalTermTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/RationalTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/SortTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/TermEquivalenceTest.java delete mode 100644 trunk/source/Library-SMTLIBTest/src/de/uni_freiburg/informatik/ultimate/logic/UnfletTest.java delete mode 100644 trunk/source/SMTInterpol/.classpath delete mode 100644 trunk/source/SMTInterpol/.externalToolBuilders/SMTInterpol-Generator.launch delete mode 100644 trunk/source/SMTInterpol/.project delete mode 100644 trunk/source/SMTInterpol/META-INF/MANIFEST.MF delete mode 100644 trunk/source/SMTInterpol/README.txt delete mode 100644 trunk/source/SMTInterpol/build.properties delete mode 100644 trunk/source/SMTInterpol/build.xml delete mode 100644 trunk/source/SMTInterpol/pom.xml delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/ChannelUtil.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/Config.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/DefaultLogger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/IParser.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/InputTruncation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/LogProxy.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/Main.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/RandomSeedFinder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/Version.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/Version.template delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/aiger/AIGERFrontEnd.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/build-version.xml delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/Clausifier.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/EqualityProxy.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/LogicSimplifier.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/SMTAffineTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/TermCompiler.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dimacs/DIMACSParser.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dimacs/dimacs.cup delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dimacs/dimacs.flex delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/AtomQueue.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/BooleanVarAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/Clause.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/ClauseDeletionHook.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/DPLLAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/DPLLEngine.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/IAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/ILiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/ITheory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/Literal.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/NamedAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/QuantifiedAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/SimpleList.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/SimpleListable.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/horn/HornSolver.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/ArrayInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/CCInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/DatatypeCycleInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/DatatypeInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/EQInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/InterpolantChecker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/InterpolantPurifier.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/Interpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/InterpolatorAffineTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/InterpolatorAtomInfo.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/InterpolatorClauseInfo.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/LAInterpolator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/SymbolChecker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/SymbolCollector.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/ArraySortInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/BidiMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/BitVectorInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/BoolSortInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/ConstantTermNormalizer.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/DataTypeInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/FiniteSortInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/FunctionValue.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/Model.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/ModelEvaluator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/ModelFormatter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/NumericSortInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/SharedTermEvaluator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/SortInterpretation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/ConstraintAdministrationSolver.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/Heuristics.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/MusContainer.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/MusEnumerationScript.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/MusOptions.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/MusUtils.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/ReMus.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/Shrinking.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/Translator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/UnexploredMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/BigIntegerOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/BooleanOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/ChannelOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/DoubleOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/EnumOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/FrontEndOptions.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/LoggerOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/LongOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/Option.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/OptionMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/SMTInterpolConstants.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/SMTInterpolOptions.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/SolverOptions.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/StringOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/StringOptionWithWarning.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/option/VerbosityOption.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/CongRewriteFunctionFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/FixProofDAG.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/IProofTracker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/LeafNode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/MatchRewriteFunctionFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/MinimalProofChecker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/NoopProofTracker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/OccurrenceCounter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/Polynomial.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofConstants.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofNode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofRules.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofSimplifier.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofTermGenerator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofTracker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/PropProofChecker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/RecyclePivots.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ResolutionNode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/SourceAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/Transformations.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/UnitCollector.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/UnsatCoreCollector.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/checker/CheckingScript.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/checker/Main.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/checker/proofs.cup delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/checker/proofs.flex delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/CopyScript.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/DefinitionExpander.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/LinearArithmeticChecker.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/PrepareScript.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/Reletter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/TermCompilerTester.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/scripts/Unletter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtcomp/Prepare.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtcomp/Track.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib/Benchmark.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib/SMTLIBParser.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib/smtlib.cup delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib/smtlib.flex delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/AssertionList.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/ErrorCallback.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/GetValueResult.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/InterpolationInfo.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/ParseEnvironment.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/SExpression.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/SMTInterpol.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/SMTLIB2Parser.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/TerminationRequest.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/smtlib.cup delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/smtlib.flex delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/test_generator/Generator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/test_generator/Main.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/test_generator/TBenchmark.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/bitvector/BvToIntUtils.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/bitvector/BvUtils.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/ArrayTheory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCAppTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCBaseTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCEquality.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCParentInfo.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCProofGenerator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CCTermPairHash.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CClosure.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CompareTrigger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CongruencePath.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/DTReverseTrigger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/DataTypeLemma.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/DataTypeTheory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/ModelBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/ReverseTrigger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/WeakCongruencePath.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/ApplyConstructiveEqualityReasoning.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/ApplyDestructiveEqualityReasoning.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/BinaryRelation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EprEqualityPredicate.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EprHelpers.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EprPredicate.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EprTheory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EprTheorySettings.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/EqualityManager.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/TTSubstitution.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/TermTuple.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprGroundEqualityAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprGroundPredicateAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprPredicateAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprQuantifiedEqualityAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/atoms/EprQuantifiedPredicateAtom.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/ClauseDpllLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/ClauseEprGroundLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/ClauseEprLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/ClauseEprQuantifiedLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/ClauseLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/EprClause.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/EprClauseFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/EprClauseManager.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/EprClauseState.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/clauses/UnitPropagationData.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/DawgFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgbuilders/DawgBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgbuilders/MappedDawgBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgbuilders/ProductDawgBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgbuilders/ProjectDawgBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgbuilders/ReorderDawgBuilder.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgletters/DawgLetter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgletters/DawgLetterFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgstates/DawgState.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/dawgs/dawgstates/DawgStateFactory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/DecideStackDecisionLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/DecideStackEntry.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/DecideStackGroundLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/DecideStackLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/DecideStackPropagatedLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/EprDecideStack.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/partialmodel/GroundPropagationInfo.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/BinaryMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/NestedMap2.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/NestedMap3.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/NestedMap4.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/NestedMap5.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/Pair.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/epr/util/Triple.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/AnnotationToProofTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/BoundConstraint.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/CompositeReason.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/CutCreator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/EQAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/ExactInfinitesimalNumber.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/Explainer.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/InfinitesimalNumber.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LAAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LAEquality.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LAReason.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LASharedTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LinArSolve.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LinTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LinVar.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/LiteralReason.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/MatrixEntry.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/MutableAffineTerm.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/SOIPivoter.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/TableauxRow.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/DestructiveEqualityReasoning.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/InstClause.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/InstantiationManager.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantAnnotation.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantAuxEquality.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantBoundConstraint.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantClause.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantEquality.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantLiteral.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantUtil.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/QuantifierTheory.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/SubstitutionHelper.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/dawg/Dawg.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/CompareCode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/EMCompareTrigger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/EMReverseTrigger.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/EMatching.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/FindCode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/GetArgCode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/ICode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/PatternCompiler.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/ReverseCode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/quant/ematching/YieldCode.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ArrayMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ArrayQueue.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/CollectionsHelper.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ComputeSCC.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/CuckooHashSet.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/DAGSize.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/FunctionalMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/IdentityHashSet.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/IntAllocator.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ListSet.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/Polynomial.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ResourceLimit.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ScopedArrayList.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ScopedIdentityHashMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ScopedLinkedHashMap.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/ScopedLinkedHashSet.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/SharingSet.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/SymmetricPair.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/TermUtils.java delete mode 100644 trunk/source/SMTInterpol/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/TimeoutHandler.java delete mode 100644 trunk/source/SMTInterpolTest/.classpath delete mode 100644 trunk/source/SMTInterpolTest/.project delete mode 100644 trunk/source/SMTInterpolTest/META-INF/MANIFEST.MF delete mode 100644 trunk/source/SMTInterpolTest/build.properties delete mode 100644 trunk/source/SMTInterpolTest/pom.xml delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestDawgLetters.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestProjectColumnAway.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestReorder.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestSetOperations.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestSignatureTranslations.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/DawgTestSymmTransClosure.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/epr/dawgs/EprTestHelpers.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/CompilerTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/IntDivideTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/StablyInfiniteTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/TermCompilerTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/convert/TerminationRequestTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/AllSatTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/Incremental.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/dpll/SimpleListTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/EqInterpolatorIntTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/interpolate/EqInterpolatorRealTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/model/ModelTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/muses/MusesTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/ProofSimplifierTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/proof/RPITest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/APITest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/smtlib2/AssumptionTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/bitvector/BitvectorTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/CongruentAddTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/cclosure/PairHashTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/theory/linar/EpsilonTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/de/uni_freiburg/informatik/ultimate/smtinterpol/util/FunctionalMapTest.java delete mode 100644 trunk/source/SMTInterpolTest/src/system/SystemTest.java delete mode 100644 trunk/source/SMTInterpolTest/test/abv/indexInRange01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const008.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const009.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const010.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const011.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const012.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const013.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const014.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const015.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/const016.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/difftest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/difftest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/difftest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/array/difftest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvand01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvand02.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvand03.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvcompare.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvshl01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvsignextend.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/bvzeroextend.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/test01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/test02.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/test03.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/bv/test04.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/cycle.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/cycle_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/cycle_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/cycle_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_7.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/datatype_8.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/generic_datatype.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/match_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/match_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/match_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/match_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/match_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/model/almost_cycle.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/model/datatype_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/model/datatype_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/generic_match_test.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/match_test.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/match_test_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/match_test_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/match_test_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/datatype/quantified/quoted_match_test.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/emptyTest.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-deleteAll.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-deleteAll.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-find.imp-001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-find.imp-002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-insert-safety.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-insert-safety.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-last-uv.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-last-uv.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-last.imp-001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-last.imp-002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-reverse.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-reverse.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest-orr-sll-swap.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-equality-eliminated/eprtest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-still-too-hard/eprtest-orr-csll-is_h_on_cycle.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr-still-too-hard/eprtest-orr-csll-is_h_on_cycle.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/emptyTest.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-deleteAll.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-deleteAll.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-find.imp-001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-find.imp-002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-insert-safety.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-insert-safety.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-last.imp-001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-last.imp-002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-reverse.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-reverse.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest-orr-sll-swap.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/eprtest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/stratified_functions_01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/stratified_functions_02.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/stratified_functions_03.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/suspended/eprtest-orr-sll-last-uv.imp-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/epr/suspended/eprtest-orr-sll-last-uv.imp-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arrayclosetest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arrayclosetest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arrayclosetest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arrayclosetest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arrayclosetest005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest008.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest009.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest010.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest011.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest012.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytest013.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytreetest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytreetest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/arraytreetest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/cctest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/cctest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/cctest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr008.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr009.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr010.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr011.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr012.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr013.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/constarr014.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cases001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cases002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cases003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cases004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cases005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_constructor001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_constructor002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_cycle008.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_disjoint001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_disjoint002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_disjoint003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_disjoint004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_disjoint005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_injective001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_injective002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_injective003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_injective004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_project_error.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_tester006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/datatype/dt_unique006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ipltst.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ipltst1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ipltst2.smt delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ipltst2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ipltst3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/liatest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/liatest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/mccarthy1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/mccarthy2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/treetest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/treetest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/trivdiseq001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/trivdiseq002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/trivdiseq003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ufliatest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ufliatest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ufliatest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/ufliatest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/uflratest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/uflratest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/uflratest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/uflratest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/uflratest005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/interpolation/weakeqext001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divdiv7.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divtest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/divtest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-0.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-10.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-7.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-8.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-273-245-9.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-0.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-10.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-7.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-8.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lia/tightrhombus-283-245-9.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/10-vars/cut_lemma_01_001-a.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/10-vars/cut_lemma_01_001-b.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/10-vars/cut_lemma_02_001-a.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/10-vars/cut_lemma_02_001-b.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/10-vars/cut_lemma_02_003-a.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/20-vars/cut_lemma_01_002-a.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/cut-lemmas/20-vars/cut_lemma_01_002-b.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/shareintreal.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-273-245-4-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-273-245-4-satmod.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-273-245-4-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-273-245-4b-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-273-245-4b-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-283-245-4-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-283-245-4-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-283-245-4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-10-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-10-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-8-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-8-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-9-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-273-245-9-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-10-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-10-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-4-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-4-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-8-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-8-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-9-sat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/lira/tightrhombus-lira-283-245-9-unsat.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120307BugAssertInLinArSolve.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120309-BugIntegerlInterpolation-1.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugColorMixedOccurrence01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugColorMixedOccurrence02.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugColorMixedOccurrence03.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugColorMixedOccurrence04.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugInterpolantNotInductive01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120310-BugInterpolantNotInductive02.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120311-Bug-computeEQInterpolant01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120311-Bug-computeEQInterpolant02.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120311-Bug-computeFreeVars01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120311-Bug-interpolateLeafs01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120311-Bug-interpolateLeafs02.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120316-Bug-InterpolatorAffineTerm.toLeq0-01.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120322-BugAffineTermAssert.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120324-BugInterpolatorAffineTerm.toLeq0-original.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120324-BugInterpolatorAffineTerm.toLeq0-push-pop-removed.smt2.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120324Bug-checkBrpCounters01.smt.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120324Bug-checkBrpCounters02.smt.gz delete mode 100644 trunk/source/SMTInterpolTest/test/matthias/20120324Bug-computeEpsilon01.smt.gz delete mode 100644 trunk/source/SMTInterpolTest/test/model/array001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/model/array002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/model/array003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/model/buggy001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/nia/divaxiom1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/nia/divaxiom2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/nia/modaxiom.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_bruttomesso.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_diff.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_selectoverstore.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_sos_withfunction.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_store.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_weakeqext.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_weakeqext_001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_weakeqext_withfunction.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/array_withfunction.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/div_high.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/div_low.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/eq_neg_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/eq_neg_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/eq_pos_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/eq_pos_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/excluded_middle.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_neg_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_neg_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_neg_red.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_pos_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_pos_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/ite_pos_red.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/or_neg.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/or_pos.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/term_ite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/to_int_high.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/to_int_low.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/auxaxioms/true_not_false.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/cclemma/trivialdiseq.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/cclemma/trivialdiseqarray.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_cases_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_constructor_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_constructor_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_cycle_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_cycle_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_cycle_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_disjoint_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_disjoint_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_injective_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_injective_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_injective_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_bool_6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_match_gen_6.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_project_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_project_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_project_int_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_project_int_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_tester_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_tester_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_tester_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_tester_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/datatype/dt_unique_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/quantaux/aux_forall.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/and_rewrite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/div.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/divisible.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/divreal.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/expand.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/imp_rewrite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/leq_false.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/leq_true.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/match_rewrite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/mod.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/mul.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/or_simp.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/or_taut.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/plus.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/select_over_store.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/store_over_store.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/store_rewrite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/to_int.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/to_leq0.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/xor_notnot.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/rewrite/xor_rewrite.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/split/iteminus.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/split/iteplus.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/split/notor.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/split/xorminus.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/proof/split/xorplus.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_insert_check_heap_access_38_4_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_insert_check_heap_access_38_4_interpolation_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_insert_check_heap_access_38_4_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_insert_postcondition_of_dl_insert_17_4_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_insert_postcondition_of_dl_insert_17_4_interpolation_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_free_49_4_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_free_49_4_interpolation_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_free_49_4_interpolation_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_free_49_4_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_free_49_4_interpolation_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_heap_access_38_4_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_remove_check_heap_access_40_6_1_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_traverse_postcondition_of_dl_traverse_24_1_interpolation_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/dl_traverse_postcondition_of_dl_traverse_24_1_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/insert_check_heap_access_26_4_interpolation_3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/rec_concat_postcondition_of_rec_concat_31_1_interpolation_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/rec_copy_loop_postcondition_of_rec_copy_loop_38_4_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/rec_copy_loop_postcondition_of_rec_copy_loop_38_4_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/rec_copy_loop_postcondition_of_rec_copy_loop_38_4_interpolation_5.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/remove_postcondition_of_remove_33_4_interpolation_4.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/reverse_postcondition_of_reverse_26_1_interpolation_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/benchmark/timeout/union_check_heap_access_40_4_interpolation_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/quant001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/quant002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/quant003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified-interpolation/quanttreetest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/ArrayInitialization02.bplJordan.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/arrayext001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/arrayext002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/arrayext003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest005.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest006.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest007.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest008.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest009.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/quantified/quanttest010.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/20051113-1.c_false-valid-memtrack.i_AllErrorsAtOnce_12_TraceCheck.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/20190906-CLEARSY-0012-00092-check30.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/Script_eureka_05_simplified_1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/Script_simple_true-unreach-call_false-valid-memtrack.i_Iterationsimple_true-unreach-call_false-valid-memtrack.i_2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/Script_skipped_true-unreach-call.i_6.simplified.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/add_excluded_middle1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/add_excluded_middle2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/add_excluded_middle_bug.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/pop2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1523.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1567.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1576.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1776.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1875.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/191.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/1917.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/201.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/235.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/751.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/array2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/arridx.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/cast.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/cast1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/cast2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/ematching.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/interpol.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue101.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue102.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue103.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue104.smt2.slow delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue50.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue51.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue52.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue53.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue54.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue55.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue56.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue57.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue58.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue77_npe.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue83.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue86_unsatcore.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue87.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue92-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue94.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue97-1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue97-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue97-3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue98.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue99-2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/issue99.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/npe1.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/npe2.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/regression/smtfuzz/npe3.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/simplify/simplify-interpolants.smt2.bz2 delete mode 100644 trunk/source/SMTInterpolTest/test/simplify/simplify.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/simplify/simplifyContext.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/ufbv/ufbv01.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/uflira/uflira_001.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/uflira/uflira_002.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/uflira/uflira_003.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/uflira/uflira_004.smt2 delete mode 100644 trunk/source/SMTInterpolTest/test/uflira/uflira_005.smt2 diff --git a/trunk/source/Library-SMTLIB/.classpath b/trunk/source/Library-SMTLIB/.classpath deleted file mode 100644 index 375961e4d61..00000000000 --- a/trunk/source/Library-SMTLIB/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/trunk/source/Library-SMTLIB/.project b/trunk/source/Library-SMTLIB/.project deleted file mode 100644 index 19d2af8e478..00000000000 --- a/trunk/source/Library-SMTLIB/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - Library-SMTLIB - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/trunk/source/Library-SMTLIB/META-INF/MANIFEST.MF b/trunk/source/Library-SMTLIB/META-INF/MANIFEST.MF deleted file mode 100644 index 6f49e68d1fa..00000000000 --- a/trunk/source/Library-SMTLIB/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: de.uni_freiburg.informatik.ultimate.lib.smtlib -Bundle-SymbolicName: de.uni_freiburg.informatik.ultimate.lib.smtlib -Bundle-Vendor: Ultimate Program Analysis Team -Bundle-Version: 0.3.0 -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Require-Bundle: de.uni_freiburg.informatik.ultimate.lib.util -Export-Package: de.uni_freiburg.informatik.ultimate.logic, - de.uni_freiburg.informatik.ultimate.logic.simplification, - de.uni_freiburg.informatik.ultimate.util -Automatic-Module-Name: de.uni.freiburg.informatik.ultimate.lib.smtlib diff --git a/trunk/source/Library-SMTLIB/build.properties b/trunk/source/Library-SMTLIB/build.properties deleted file mode 100644 index 41eb6ade2b4..00000000000 --- a/trunk/source/Library-SMTLIB/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/trunk/source/Library-SMTLIB/pom.xml b/trunk/source/Library-SMTLIB/pom.xml deleted file mode 100644 index fd789582b73..00000000000 --- a/trunk/source/Library-SMTLIB/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - - mavenparent - de.uni_freiburg.informatik.ultimate - 0.3.0 - ../BA_MavenParentUltimate/pom.xml - - - de.uni_freiburg.informatik.ultimate - de.uni_freiburg.informatik.ultimate.lib.smtlib - 0.3.0 - eclipse-plugin - diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/AnnotatedTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/AnnotatedTerm.java deleted file mode 100644 index 59888bf5ef3..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/AnnotatedTerm.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -//import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Representation of annotated terms in SMTLIB 2. This class stores terms of - * the form - * 

- * (! ... :key_1 value_1 ... :key_n value_n)
- *
- * - * An annotated term is created by - * {@link Script#annotate(Term, Annotation...)}. - * - * @author hoenicke - */ -public class AnnotatedTerm extends Term { - private final Term mSubterm; - private final Annotation[] mAnnotations; - - AnnotatedTerm(Annotation[] annots, Term term, int hash) { - super(hash); - mAnnotations = annots; - mSubterm = term; - } - - @Override - public Sort getSort() { - return mSubterm.getSort(); - } - /** - * Get the term that is annotated by the annotations stored in this term. - * @return The subterm of this term. - */ - public Term getSubterm() { - return mSubterm; - } - /** - * Get all annotations stored in this term. The resulting array should not - * be modified! - * @return The annotations stored in this term. - */ - public Annotation[] getAnnotations() { - return mAnnotations; - } - - public static int hashAnnotations(Annotation[] annots, Term subTerm) { - return //subTerm.hashCode() * 31 + Arrays.hashCode(annots); - HashUtils.hashJenkins(subTerm.hashCode(), (Object[])annots); - } - - @Override - public void toStringHelper(ArrayDeque mTodo) { - // Add annotations to stack. - mTodo.addLast(")"); - final Annotation[] annots = getAnnotations(); - for (int i = annots.length - 1; i >= 0; i--) { - if (annots[i].getValue() != null) { - mTodo.addLast(annots[i].getValue()); - mTodo.addLast(" "); - } - mTodo.addLast(" " + annots[i].getKey()); - } - mTodo.addLast(getSubterm()); - mTodo.addLast("(! "); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Annotation.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Annotation.java deleted file mode 100644 index 6a4bfaac9b4..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Annotation.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.Arrays; - -/** - * Representation of an annotation in a formula. Note that the keys ":named", - * and ":pattern" have special meaning as described in the SMTLIB version 2 - * standard. - * @author Jochen Hoenicke - */ -public class Annotation { - /** - * The key of the annotation. This includes the colon in front of it. - */ - final String mKey; - - /** - * The value of the annotation. - * In concrete syntax an annotation is an sexpr, i.e., there are three - * cases: - *
    - *
  • symbol: this is represented by a String object.
    • - *
  • constant: this is represented by a ConstantTerm object.
    • - *
  • (sexpr*): this is represented by an Object[] array.
    • - *
- * - * However some annotations are preparsed. E.g. the :pattern annotation - * is represented as an array of Terms. - */ - final Object mValue; - - public Annotation(final String key, final Object value) { - if (key == null) { - throw new SMTLIBException("Empty annotations not allowed!"); - } - mKey = key; - mValue = value; - } - - /** - * Returns the key of the annotation. This includes the colon, with which each annotation starts. - * - * @return the key of the annotation. - */ - public String getKey() { - return mKey; - } - - /** - * Returns the value of the annotation. This is null for the empty annotation. The object depends on the type of the - * annotation. It can be a term (constants, patterns) a simple string, or an array of terms/strings/arrays. - * - * @return the value of the annotation. - */ - public Object getValue() { - return mValue; - } - - @Override - public boolean equals(final Object obj) { - if (obj instanceof Annotation) { - final Annotation annot = (Annotation) obj; - return mKey.equals(annot.mKey) - && (mValue == null ? annot.mValue == null - : mValue instanceof Object[] - && annot.mValue instanceof Object[] - ? Arrays.deepEquals((Object[]) mValue, - (Object[]) annot.mValue) - : mValue.equals(annot.mValue)); - } - return false; - } - - @Override - public int hashCode() { - return mKey.hashCode() * 31 - + (mValue == null ? 0 - : mValue instanceof Object[] - ? Arrays.deepHashCode((Object[]) mValue) - : mValue.hashCode()); - } - - @Override - public String toString() { - return "(" + mKey + " " + mValue + ")"; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ApplicationTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ApplicationTerm.java deleted file mode 100644 index d9b40d570f7..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ApplicationTerm.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents a function application term. This consists of a function symbol and zero or more sub-terms (the parameters - * of the function). A constant is represented as function application with zero parameters. - * - * An application term is created by {@link Script#term(String, Term...)} or for indexed function symbols or for symbols - * with generic return sort by {@link Script#term(String, String[], Sort, Term...)}. - * - * @author hoenicke - */ -public class ApplicationTerm extends Term { - final FunctionSymbol mFunction; - final Term[] mParameters; - - ApplicationTerm(final FunctionSymbol function, final Term[] parameters, final int hash) { - super(hash); - function.typecheck(parameters); - mFunction = function; - mParameters = parameters; - } - - /** - * Get the function symbol. - * @return the function symbol. - * @see FunctionSymbol#getName() - */ - public FunctionSymbol getFunction() { - return mFunction; - } - - /** - * Get the parameters of the function application. - * @return the parameters. For constants this array is empty. - * Never write to this array! - */ - public Term[] getParameters() { - return mParameters; - } - - /** - * {@inheritDoc} - */ - @Override - public Sort getSort() { - return mFunction.mReturnSort.getRealSort(); - } - - static final int hashApplication( - final FunctionSymbol func, final Term[] parameters) { - return HashUtils.hashJenkins(func.hashCode(), (Object[])parameters); - } - - /** - * {@inheritDoc} - */ - @Override - public void toStringHelper(final ArrayDeque mTodo) { - final String func = getFunction().getApplicationString(); - final Term[] args = getParameters(); - if (args.length == 0) { - mTodo.add(func); - } else { - // Add arguments to stack. - mTodo.addLast(")"); - for (int i = args.length - 1; i >= 0; i--) { - mTodo.addLast(args[i]); - mTodo.addLast(" "); - } - mTodo.add(func); - mTodo.add("("); - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Assignments.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Assignments.java deleted file mode 100644 index e6f294152c0..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Assignments.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.Iterator; -import java.util.Map; -import java.util.NoSuchElementException; - -/** - * Class used as a response to get-assignments. This class carries truth values - * for all named Boolean terms that are asserted so far. - * @author Juergen Christ - */ -public class Assignments { - /** - * Iterator over all assignments with one specific Boolean value. This is - * essentially a filtering iterator. - * @author Juergen Christ - */ - private class TruthIterator implements Iterator { - /** - * The value we want to filter. - */ - private final Boolean mTruthVal; - /** - * The filtered iterator. - */ - private final Iterator> mIt; - /** - * The next value to return. - */ - private String mNextVal; - /** - * Initialize the filter iterator. - * @param truthVal - */ - public TruthIterator(Boolean truthVal) { - mTruthVal = truthVal; - mIt = mAssignment.entrySet().iterator(); - nextVal(); - } - /** - * Search for the next value to return. - */ - private void nextVal() { - while (mIt.hasNext()) { - final Map.Entry me = mIt.next(); - if (me.getValue() == mTruthVal) { - mNextVal = me.getKey(); - return; - } - } - mNextVal = null; - } - - @Override - public boolean hasNext() { - return mNextVal != null; - } - - @Override - public String next() { - final String val = mNextVal; - if (val == null) { - throw new NoSuchElementException(); - } - nextVal(); - return val; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - - } - /** - * Store the assignment. - */ - private final Map mAssignment; - /** - * The number of labels assigned to true. This is lazily computed. - */ - private int mNumTrue = -1; - /** - * Construct a new assignment. - * @param assignment Map containing the assignments extracted by the solver. - */ - public Assignments(Map assignment) { - mAssignment = assignment; - } - /** - * Get the assignment of a named Boolean term. - * @param label Label of the Boolean term. - * @return Truth value assigned to the corresponding named Boolean term. - */ - public Boolean getAssignment(String label) { - return mAssignment.get(label); - } - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append('('); - for (final Map.Entry me : mAssignment.entrySet()) { - sb.append('(').append(me.getKey()).append(' '). - append(me.getValue()).append(')'); - } - sb.append(')'); - return sb.toString(); - } - /** - * Iterate over all labels whose corresponding named Boolean term is - * assigned true in the current model. - * @return Iterator over all satisfied named Boolean terms. - */ - public Iterable getTrueAssignments() { - return new Iterable() { - - @Override - public Iterator iterator() { - return new TruthIterator(Boolean.TRUE); - } - }; - } - /** - * Iterate over all labels whose corresponding named Boolean term is - * assigned false in the current model. - * @return Iterator over all falsified named Boolean terms. - */ - public Iterable getFalseAssignments() { - return new Iterable() { - - @Override - public Iterator iterator() { - return new TruthIterator(Boolean.FALSE); - } - }; - } - /** - * Get the number of labels assigned to true. - * @return Number of labels assigned to true. - */ - public int getNumTrueAssignments() { - if (mNumTrue == -1) { - mNumTrue = 0; - for (final Map.Entry me : mAssignment.entrySet()) { - if (me.getValue() == Boolean.TRUE) { - ++mNumTrue; - } - } - } - return mNumTrue; - } - /** - * Get the number of labels assigned to false. - * @return Number of labels assigned to false. - */ - public int getNumFalseAssignments() { - return mAssignment.size() - getNumTrueAssignments(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/CheckClosedTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/CheckClosedTerm.java deleted file mode 100644 index caa51df2683..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/CheckClosedTerm.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2009-2014 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.ScopedHashSet; - -/** - * Class to check if a term is closed. It is closed if it does not contain - * a free variable. Use it as follows: - * - * 
new CheckClosedTerm().isClosed()
- * - * You can check multiple terms with one instance and it will cache results - * between checks. - * - * @author Jochen Hoenicke - */ -public class CheckClosedTerm extends NonRecursive { - private final ScopedHashSet mCheckedTerms; - private boolean mIsClosed; - - static class TermWalker implements NonRecursive.Walker { - final Term mTerm; - - public TermWalker(Term term) { - mTerm = term; - } - - @Override - public void walk(NonRecursive engine) { - ((CheckClosedTerm) engine).check(mTerm); - } - } - - static class MatchCaseWalker implements NonRecursive.Walker { - final MatchTerm mMatch; - final int mCaseNr; - - public MatchCaseWalker(MatchTerm match, int caseNr) { - mMatch = match; - mCaseNr = caseNr; - } - - @Override - public void walk(NonRecursive engine) { - ((CheckClosedTerm) engine).checkMatchCase(mMatch, mCaseNr); - } - } - - static class EndScopeWalker implements NonRecursive.Walker { - @Override - public void walk(NonRecursive engine) { - ((CheckClosedTerm) engine).mCheckedTerms.endScope(); - } - } - - /** - * The default constructor. - */ - public CheckClosedTerm() { - mCheckedTerms = new ScopedHashSet(); - } - - /** - * Check if term t is closed. I.e., it contains no free term variable. - * @param t the term that is checked. - * @return true if the term is closed; false otherwise. - */ - public boolean isClosed(Term t) { - mIsClosed = true; - run(new TermWalker(t)); - return mIsClosed; - } - - void check(Term t) { - if (mCheckedTerms.contains(t) || !mIsClosed) { - return; - } - mCheckedTerms.add(t); - if (t instanceof ApplicationTerm) { - for (final Term arg : ((ApplicationTerm)t).getParameters()) { - enqueueWalker(new TermWalker(arg)); - } - } else if (t instanceof AnnotatedTerm) { - enqueueWalker(new TermWalker(((AnnotatedTerm)t).getSubterm())); - } else if (t instanceof LetTerm) { - final LetTerm let = (LetTerm) t; - for (final Term value : let.getValues()) { - enqueueWalker(new TermWalker(value)); - } - mCheckedTerms.beginScope(); - enqueueWalker(new EndScopeWalker()); - for (final TermVariable var : let.getVariables()) { - mCheckedTerms.add(var); - } - enqueueWalker(new TermWalker(let.getSubTerm())); - } else if (t instanceof TermVariable) { - /* all bound term variables were added to mCheckedTerms */ - mIsClosed = false; - } else if (t instanceof QuantifiedFormula) { - final QuantifiedFormula quant = (QuantifiedFormula) t; - mCheckedTerms.beginScope(); - enqueueWalker(new EndScopeWalker()); - for (final TermVariable var : quant.getVariables()) { - mCheckedTerms.add(var); - } - enqueueWalker(new TermWalker(quant.getSubformula())); - } else if (t instanceof MatchTerm) { - final MatchTerm match = (MatchTerm) t; - for (int i = 0; i < match.getCases().length; i++) { - enqueueWalker(new MatchCaseWalker(match, i)); - } - enqueueWalker(new TermWalker(match.getDataTerm())); - } else if (!(t instanceof ConstantTerm)) { - throw new AssertionError("Unknown term: " + t.getClass()); - } - } - - void checkMatchCase(MatchTerm match, int caseNr) { - mCheckedTerms.beginScope(); - for (final TermVariable var : match.getVariables()[caseNr]) { - mCheckedTerms.add(var); - } - enqueueWalker(new EndScopeWalker()); - enqueueWalker(new TermWalker(match.getCases()[caseNr])); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ComputeFreeVariables.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ComputeFreeVariables.java deleted file mode 100644 index d15890618f1..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ComputeFreeVariables.java +++ /dev/null @@ -1,316 +0,0 @@ -/* - * Copyright (C) 2009-2022 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; - -/** - * Helper to compute the free variables contained in a term. This is a very - * simple term transformer that returns the input term but computes the free - * variables and sets the corresponding field. - * - * @author Jochen Hoenicke - */ -public class ComputeFreeVariables extends NonRecursive { - static final TermVariable[] NOFREEVARS = new TermVariable[0]; - - public ComputeFreeVariables() { - } - - public void transform(final Term term) { - enqueueTerm(term); - run(); - } - - public void enqueueTerm(final Term term) { - enqueueWalker((final NonRecursive engine) -> walkTerm(term)); - } - - public void walkTerm(final Term term) { - if (term.mFreeVars != null) { - return; - } - - if (term instanceof ConstantTerm) { - term.mFreeVars = NOFREEVARS; - } else if (term instanceof TermVariable) { - term.mFreeVars = new TermVariable[] { (TermVariable) term }; - } else if (term instanceof ApplicationTerm) { - walkApplicationTerm((ApplicationTerm) term); - } else if (term instanceof LetTerm) { - walkLetTerm((LetTerm) term); - } else if (term instanceof AnnotatedTerm) { - walkAnnotatedTerm((AnnotatedTerm) term); - } else if (term instanceof LambdaTerm) { - walkLambdaTerm((LambdaTerm) term); - } else if (term instanceof QuantifiedFormula) { - walkQuantifiedFormula((QuantifiedFormula) term); - } else if (term instanceof MatchTerm) { - walkMatchTerm((MatchTerm) term); - } else { - throw new AssertionError("Unknown Term"); - } - } - - public void walkApplicationTerm(final ApplicationTerm appTerm) { - boolean enqueuedAgain = false; - for (final Term param : appTerm.getParameters()) { - if (param.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(appTerm); - enqueuedAgain = true; - } - enqueueTerm(param); - } - } - - if (enqueuedAgain) { - // we need to first compute free vars of child and have enqueued ourselves again - // afterwards. - return; - } - - // Here we compute the free variables of the application term. - final Term[] params = appTerm.getParameters(); - if (params.length <= 1) { - if (params.length == 1) { - appTerm.mFreeVars = params[0].mFreeVars; - } else { - appTerm.mFreeVars = ComputeFreeVariables.NOFREEVARS; - } - } else { - int biggestlen = 0; - int biggestidx = -1; - for (int i = 0; i < params.length; i++) { - final TermVariable[] free = params[i].mFreeVars; - if (free.length > biggestlen) { - biggestlen = free.length; - biggestidx = i; - } - } - /* return if term is closed */ - if (biggestidx < 0) { - appTerm.mFreeVars = ComputeFreeVariables.NOFREEVARS; - } else { - List result = null; - final List biggestAsList = Arrays.asList(params[biggestidx].mFreeVars); - for (int i = 0; i < params.length; i++) { - if (i == biggestidx) { - continue; - } - final TermVariable[] free = params[i].getFreeVars(); - for (final TermVariable tv : free) { - if (!biggestAsList.contains(tv)) { - if (result == null) { - result = new ArrayList<>(); - result.addAll(biggestAsList); - } - if (!result.contains(tv)) { - result.add(tv); - } - } - } - } - if (result == null) { - appTerm.mFreeVars = params[biggestidx].mFreeVars; - } else { - appTerm.mFreeVars = result.toArray(new TermVariable[result.size()]); - } - } - } - } - - public void walkLetTerm(final LetTerm letTerm) { - boolean enqueuedAgain = false; - final Term[] vals = letTerm.getValues(); - for (final Term value : vals) { - if (value.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(letTerm); - enqueuedAgain = true; - } - enqueueTerm(value); - } - } - final Term body = letTerm.getSubTerm(); - if (body.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(letTerm); - enqueuedAgain = true; - } - enqueueTerm(body); - } - - if (enqueuedAgain) { - // we need to first compute free vars of child and have enqueued ourselves again - // afterwards. - return; - } - final TermVariable[] vars = letTerm.getVariables(); - final HashSet free = new LinkedHashSet<>(); - free.addAll(Arrays.asList(body.mFreeVars)); - free.removeAll(Arrays.asList(vars)); - for (final Term v : vals) { - free.addAll(Arrays.asList(v.mFreeVars)); - } - if (free.isEmpty()) { - letTerm.mFreeVars = NOFREEVARS; - } else { - letTerm.mFreeVars = free.toArray(new TermVariable[free.size()]); - } - } - - public void walkLambdaTerm(final LambdaTerm lambdaTerm) { - final Term body = lambdaTerm.getSubterm(); - if (body.mFreeVars == null) { - // we need to first compute free vars of child and enqueue ourselves again - // afterwards. - enqueueTerm(lambdaTerm); - enqueueTerm(body); - return; - } - - final HashSet free = new LinkedHashSet<>(); - free.addAll(Arrays.asList(body.mFreeVars)); - free.removeAll(Arrays.asList(lambdaTerm.getVariables())); - if (free.isEmpty()) { - lambdaTerm.mFreeVars = NOFREEVARS; - } else { - lambdaTerm.mFreeVars = free.toArray(new TermVariable[free.size()]); - } - } - - public void walkQuantifiedFormula(final QuantifiedFormula quant) { - final Term body = quant.getSubformula(); - if (body.mFreeVars == null) { - // we need to first compute free vars of child and enqueue ourselves again - // afterwards. - enqueueTerm(quant); - enqueueTerm(body); - return; - } - - final HashSet free = new LinkedHashSet<>(); - free.addAll(Arrays.asList(body.mFreeVars)); - free.removeAll(Arrays.asList(quant.getVariables())); - if (free.isEmpty()) { - quant.mFreeVars = NOFREEVARS; - } else { - quant.mFreeVars = free.toArray(new TermVariable[free.size()]); - } - } - - public void walkAnnotatedTerm(final AnnotatedTerm annotTerm) { - boolean enqueuedAgain = false; - final HashSet free = new LinkedHashSet<>(); - final Term body = annotTerm.getSubterm(); - if (body.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(annotTerm); - enqueuedAgain = true; - } - enqueueTerm(body); - } else { - free.addAll(Arrays.asList(body.mFreeVars)); - } - - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : annotTerm.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeLast(); - if (value instanceof Term) { - final Term subTerm = (Term) value; - if (subTerm.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(annotTerm); - enqueuedAgain = true; - } - enqueueTerm(subTerm); - } else if (!enqueuedAgain) { - free.addAll(Arrays.asList(((Term) value).mFreeVars)); - } - } else if (value instanceof Object[]) { - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - if (!enqueuedAgain) { - if (free.isEmpty()) { - annotTerm.mFreeVars = NOFREEVARS; - } else if (free.size() == body.mFreeVars.length) { - annotTerm.mFreeVars = body.mFreeVars; - } else { - annotTerm.mFreeVars = free.toArray(new TermVariable[free.size()]); - } - } - } - - public void walkMatchTerm(final MatchTerm match) { - boolean enqueuedAgain = false; - final Term[] cases = match.getCases(); - for (final Term subCase : cases) { - if (subCase.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(match); - enqueuedAgain = true; - } - enqueueTerm(subCase); - } - } - final Term dataTerm = match.getDataTerm(); - if (dataTerm.mFreeVars == null) { - if (!enqueuedAgain) { - enqueueTerm(match); - enqueuedAgain = true; - } - enqueueTerm(dataTerm); - } - - if (enqueuedAgain) { - // we need to first compute free vars of child and have enqueued ourselves again - // afterwards. - return; - } - final HashSet free = new LinkedHashSet<>(); - for (int i = 0; i < cases.length; i++) { - final HashSet freeCase = new LinkedHashSet<>(); - freeCase.addAll(Arrays.asList(cases[i].mFreeVars)); - freeCase.removeAll(Arrays.asList(match.getVariables()[i])); - free.addAll(freeCase); - } - free.addAll(Arrays.asList(dataTerm.mFreeVars)); - if (free.isEmpty()) { - match.mFreeVars = NOFREEVARS; - } else if (free.size() == dataTerm.mFreeVars.length) { - match.mFreeVars = dataTerm.mFreeVars; - } else { - match.mFreeVars = free.toArray(new TermVariable[free.size()]); - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ConstantTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ConstantTerm.java deleted file mode 100644 index 26e9e64da23..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ConstantTerm.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayDeque; - -/** - * A term representing constants. The Java-type of the constant depends on the - * SMTLIB-type and the origin of the term. If this term has numeral sort and - * stems from model evaluation, the Java-type of the constant will be - * {@link Rational}. If it comes from user input it typically is BigInteger for - * numerals or BigDecimal for decimals (note that you can also use Rational with - * the API, but the parser won't do that). - * - * A constant term is created by the - * {@link Script#numeral(java.math.BigInteger)}, - * {@link Script#decimal(BigDecimal)}, - * {@link Script#binary(String)}, - * {@link Script#hexadecimal(String)}, and - * {@link Script#string(QuotedObject)}. - * - * Also {@link Rational#toTerm(Sort)} creates a constant term. - * - * @author hoenicke, Juergen Christ - */ -public class ConstantTerm extends Term { - /* - * The value of this term. For numeral terms this is a BigInteger, - * for decimal terms a BigDecimal and for string terms this is a - * QuotedObject. For terms returned by our model, we use Rational for all - * numeric sorts. - */ - private final Object mValue; - private final Sort mSort; - - ConstantTerm(final Object value, final Sort sort, final int hash) { - super(hash); - mValue = value; - mSort = sort; - } - - /** - * Gets the constant value. - * If this term has numeral sort and stems from model evaluation, - * the Java-type of the constant will be {@link Rational}. If it comes - * from user input it typically is BigInteger for numerals or - * BigDecimal for decimals (note that you can also use Rational with - * the API, but the parser won't do that). For string literals this - * is a {@link QuotedObject} containing a string. Bit vector constants - * are represented by BigInteger. - * @return the value. - */ - public Object getValue() { - return mValue; - } - - @Override - public Sort getSort() { - return mSort; - } - - @Override - public String toString() { - if (mSort.isBitVecSort() && mValue instanceof BigInteger) { - return "(_ bv" + mValue.toString() + " " + mSort.getIndices()[0] + ")"; - } - if (mValue instanceof BigInteger) { - final BigInteger value = (BigInteger) mValue; - String result = value.abs().toString(); - if (value.signum() < 0) { - result = "(- " + result + ")"; - } - return result; - } - if (mValue instanceof BigDecimal) { - final BigDecimal decimal = (BigDecimal) mValue; - String result = decimal.abs().toPlainString(); - if (decimal.signum() < 0) { - result = "(- " + result + ")"; - } - return result; - } - if (mValue instanceof Rational) { - final Rational rat = (Rational) mValue; - String result = rat.numerator().abs().toString(); - if (getSort().getName() == "Real") { - result += ".0"; - } - if (rat.isNegative()) { - result = "(- " + result + ")"; - } - if (!rat.isIntegral()) { - assert getSort().getName() == "Real"; - result = "(/ " + result + " " + rat.denominator() + ".0)"; - } - return result; - } - return mValue.toString(); - } - - @Override - public String toStringDirect() { - return toString(); - } - - public static final int hashConstant(final Object value, final Sort sort) { - return value.hashCode() ^ sort.hashCode(); - } - - @Override - public void toStringHelper(final ArrayDeque mTodo) { - mTodo.add(toString()); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/DataType.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/DataType.java deleted file mode 100644 index fedd807fa45..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/DataType.java +++ /dev/null @@ -1,154 +0,0 @@ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -import java.util.Arrays; -import java.util.BitSet; -import java.util.HashSet; -import java.util.NoSuchElementException; - -/** - * Represents an SMTLIB datatype sort. - * - * @author Jochen Hoenicke - */ -public class DataType extends SortSymbol { - - public static class Constructor { - private final String mName; - private final Sort[] mArgumentSorts; - private final String[] mSelectors; - private boolean mNeedsReturnOverload; - - public Constructor(final String name, final String[] selectors, final Sort[] argumentSorts) { - mName = name; - mSelectors = selectors; - mArgumentSorts = argumentSorts; - } - - public String getName() { - return mName; - } - - public Sort[] getArgumentSorts() { - return mArgumentSorts; - } - - public int getSelectorIndex(final String selector) { - for (int i = 0; i < mSelectors.length; i++) { - if (mSelectors[i].equals(selector)) { - return i; - } - } - throw new NoSuchElementException(); - } - - public String[] getSelectors() { - return mSelectors; - } - - public boolean needsReturnOverload() { - return mNeedsReturnOverload; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("("); - sb.append(mName); - if (mSelectors.length != 0) { - for (int i = 0; i < mSelectors.length; i++) { - sb.append(" "); - sb.append("("); - sb.append(mSelectors[i]); - sb.append(" "); - sb.append(mArgumentSorts[i]); - sb.append(")"); - } - } - sb.append(")"); - return sb.toString(); - } - } - - public DataType(final Theory theory, final String name, final int numParams) { - super(theory, name, numParams, null, DATATYPE); - } - - /** - * The constructors. - */ - Constructor[] mConstructors; - /** - * The generic sort arguments. - */ - Sort[] mSortVariables; - - public void setConstructors(final Sort[] sortVars, final Constructor[] constrs) { - assert mConstructors == null; - mSortVariables = sortVars; - mConstructors = constrs; - if (sortVars != null) { - for (final Constructor cons : constrs) { - cons.mNeedsReturnOverload = checkReturnOverload(sortVars, cons.mArgumentSorts); - } - } - } - - public Sort[] getSortVariables() { - return mSortVariables; - } - - public Constructor findConstructor(final String name) { - for (int i = 0; i < mConstructors.length; i++) { - if (mConstructors[i].getName().equals(name)) { - return mConstructors[i]; - } - } - return null; - } - - public Constructor getConstructor(final String name) { - final Constructor constr = findConstructor(name); - if (constr == null) { - throw new NoSuchElementException(); - } - return constr; - } - - public Constructor[] getConstructors() { - return mConstructors; - } - - /** - * Check if a constructor of a datatype needs to be declared with - * RETURNOVERLOAD. This is the case if its arguments do not contain all sort - * parameters. - * - * @param sortParams The sort parameters of the datatype. - * @param argumentSorts The arguments of the constructor. - * @return 0 or RETURNOVERLOAD, depending on if the flag is needed. - */ - private boolean checkReturnOverload(final Sort[] sortParams, final Sort[] argumentSorts) { - final BitSet unused = new BitSet(); - unused.set(0, sortParams.length); - final ArrayDeque todo = new ArrayDeque<>(); - final HashSet seen = new HashSet<>(); - todo.addAll(Arrays.asList(argumentSorts)); - while (!todo.isEmpty()) { - final Sort sort = todo.removeFirst(); - if (seen.add(sort)) { - if (sort.isSortVariable()) { - for (int i = 0; i < sortParams.length; i++) { - if (sort == sortParams[i]) { - unused.clear(i); - break; - } - } - } else { - todo.addAll(Arrays.asList(sort.getArguments())); - } - } - } - return !unused.isEmpty(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaLet.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaLet.java deleted file mode 100644 index ccdff2aea3c..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaLet.java +++ /dev/null @@ -1,997 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Compute the common-subexpression-elimination (cse) form of a term. A term is - * in cse form if all nodes with an out-degree of at least 1 and an in-degree of - * at least 2 are eliminated, i.e., factored out into a let. - * @author hoenicke - */ -public class FormulaLet extends NonRecursive { - private final ArrayList> mVisited = new ArrayList<>(); - private final ArrayList> mScopes = new ArrayList<>(); - private final ArrayDeque mResultStack = new ArrayDeque<>(); - private int mCseNum; - private final LetFilter mFilter; - - public static interface LetFilter { - public boolean isLettable(Term t); - } - - public FormulaLet() { - this(null); - } - - public FormulaLet(final LetFilter filter) { - mFilter = filter; - } - - private int findScope(final Term term) { - final TermVariable[] tvs = term.getFreeVars(); - for (int scopeNr = mScopes.size() - 1; scopeNr >= 0; scopeNr--) { - if (mScopes.get(scopeNr) == null) { - return scopeNr; - } - for (final TermVariable tv : tvs) { - if (mScopes.get(scopeNr).contains(tv)) { - return scopeNr; - } - } - } - throw new AssertionError("no scope"); - } - - /** - * Compute the cse form of a term. Note that all lets will be removed from - * the input before computing the cse form. - * @param input The input term. - * @return A term in cse form that represents the same DAG than the input. - */ - public Term let(Term input) { - input = new FormulaUnLet().unlet(input); - mCseNum = 0; - enqueueLetter(input); - run(); - final Term result = mResultStack.removeLast(); - assert mResultStack.size() == 0 && mVisited.size() == 0; - assert new TermEquivalence().equal( - new FormulaUnLet().unlet(result), input); - return result; - } - - /** - * For the initial formula and for each named term, a new scope for term infos - * is created (mVisited). It then creates a TermInfo for the term, which is - * walked first to collect all information about the term and its subterms. - * After collecting all info, the the term is transformed. to a letted term. - * Finally, the visited scope that was initially added is removed again. - */ - public void enqueueLetter(final Term term) { - if (term instanceof TermVariable || term instanceof ConstantTerm) { - mResultStack.addLast(term); - return; - } - final Map newScope = new HashMap<>(); - mScopes.add(null); - mVisited.add(newScope); - final TermInfo info = new TermInfo(term); - enqueueWalker(new ScopeRemover()); - enqueueWalker(new Transformer(info)); - enqueueWalker(new MarkLet(info)); - enqueueWalker(new CollectInfo(term, info)); - } - - /** - * Check if this term has a :named annotation. - */ - private static boolean isNamed(final AnnotatedTerm at) { - return (at.getAnnotations().length == 1 && at.getAnnotations()[0].getKey().equals(":named")); - } - - /** - * Check if this term is a :pattern annotation. - */ - private static boolean isPattern(final Term subterm) { - if (subterm instanceof AnnotatedTerm) { - final AnnotatedTerm at = (AnnotatedTerm) subterm; - for (final Annotation annot : at.getAnnotations()) { - if (!annot.getKey().equals(":pattern")) { - return false; - } - } - return true; - } - return false; - } - - public static boolean bindsVariable(final Term parent, final Term child) { - final HashSet parentVars = new HashSet<>(Arrays.asList(parent.getFreeVars())); - for (final TermVariable tv : child.getFreeVars()) { - if (!parentVars.contains(tv)) { - return true; - } - } - return false; - } - - public void addTransformScope(final TermVariable[] vars, final Map scope) { - enqueueWalker(new ScopeRemover()); - mScopes.add(new HashSet<>(Arrays.asList(vars))); - mVisited.add(scope); - } - - /** - * Visit a child of the current term. - * - * @param let The formula let environment. - * @param term The child term to visit. - */ - public void visitChild(final Term term) { - // don't let term variables or constant terms - if (term instanceof TermVariable || term instanceof ConstantTerm) { - return; - } - // don't let function applications without arguments (constants) - if (term instanceof ApplicationTerm && ((ApplicationTerm) term).getParameters().length == 0) { - return; - } - - // check if term info exists - final Map scopedInfos = mVisited.get(findScope(term)); - TermInfo child = scopedInfos.get(term); - if (child == null) { - // create new term info and visit the child recursively. - child = new TermInfo(term); - scopedInfos.put(term, child); - enqueueWalker(new CollectInfo(term, child)); - } else { - // already visited, just count the number of predecessors. - child.mCount++; - } - } - - public Map newScope(final TermVariable[] vars) { - final HashSet varSet = new HashSet<>(Arrays.asList(vars)); - final Map newScope = new HashMap<>(); - mScopes.add(varSet); - mVisited.add(newScope); - enqueueWalker(new ScopeRemover()); - return newScope; - } - - public final static class ScopeRemover implements Walker { - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet) engine; - final int scopeNr = let.mScopes.size() - 1; - let.mScopes.remove(scopeNr); - let.mVisited.remove(scopeNr); - } - } - - /** - * This class collects informations for a term and is also a walker. As a walker it will just compute the - * predecessor counter (or occurrence counter). - */ - private final static class TermInfo { - /** - * The term for which the term info is about. - */ - final Term mTerm; - /** - * How many predecessors does this Term have? - */ - int mCount; - /** - * How many times was this Term already visited in transform. - */ - int mSeen; - /** - * The TermInfo for all sub terms that should be letted at this term. This is a - * list of list of terms to record the dependency relation between lets. If a - * letted term .cse1 uses a letted term .cse2 in its definition, the term .cse2 - * must come before .cse1 in an earlier list. - */ - ArrayDeque> mLettedTerms; - /** - * If this term is letted, this is the term variable it is letted to. - */ - TermVariable mSubst; - /** - * If this term is letted, this is the term that will build the let, i.e., the nearest common parent. - */ - TermInfo mParent; - /** - * The length of the mParent list if you read it as linked list. This is used to quickly find a common parent. - * This is always equal to {@code mParent.mPDepth + 1}. - */ - int mPDepth; - /** - * The sub scopes in case this is a quantifier, lambda term or match term. - */ - Map[] mScopes; - - public TermInfo(final Term term) { - mTerm = term; - mCount = 1; - } - - /** - * Should we build a let for this term. This is the case if this term occurs several times, or if its single - * predecessor cannot be letted and occurs several times. - * - * @return - */ - public boolean shouldBuildLet() { - TermInfo info = this; - while (info.mCount == 1) { - // we can use mParent, since we know there is a single predecessor and we - // already called mergeParent - // on it. - info = info.mParent; - // This has no parent -> no let. - if (info == null) { - return false; - } - // If we leave the scope of our variables, we cannot let. - if (bindsVariable(info.mTerm, mTerm)) { - return false; - } - // parent is letted so this term really only occurs once. - if (info.mSubst != null) { - return false; - } - } - return true; - } - - /** - * Merge the mParent with parent, i.e. find the common parent of mParent and parent and update mParent. - * - * @param parent - * The new parent that should be merged. - */ - public void mergeParent(TermInfo parent) { - if (mParent == null) { - // we don't have a parent yet, set mParent to parent. - mParent = parent; - mPDepth = parent.mPDepth + 1; - return; - } - // Find the common parent. First make sure the depth is equal, then one can just compare mParent with - // parent. - while (mParent != parent) { - if (parent.mPDepth == mParent.mPDepth) { - parent = parent.mParent; - mParent = mParent.mParent; - } else if (parent.mPDepth > mParent.mPDepth) { - parent = parent.mParent; - } else { - mParent = mParent.mParent; - } - } - mPDepth = mParent.mPDepth + 1; - } - } - - public static class CollectInfo implements Walker { - Term mTerm; - TermInfo mInfo; - - public CollectInfo(final Term term, final TermInfo info) { - mTerm = term; - mInfo = info; - } - - @SuppressWarnings("unchecked") - @Override - public void walk(final NonRecursive walker) { - final FormulaLet let = (FormulaLet) walker; - if (mTerm instanceof AnnotatedTerm) { - final AnnotatedTerm annotTerm = (AnnotatedTerm) mTerm; - // Named terms are not counted. They are letted separately. - if (!isNamed(annotTerm)) { - // walk the main subterm - let.visitChild(annotTerm.getSubterm()); - - // walk all subterms occuring in the annotation - // we use a small todo stack here in case the annotation contains nested arrays. - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : annotTerm.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeLast(); - if (value instanceof Term) { - let.visitChild((Term) value); - } else if (value instanceof Object[]) { - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - } - } else if (mTerm instanceof ApplicationTerm) { - final ApplicationTerm term = (ApplicationTerm) mTerm; - final Term[] args = term.getParameters(); - for (final Term t : args) { - let.visitChild(t); - } - } else if (mTerm instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) mTerm; - mInfo.mScopes = new Map[] { let.newScope(lambda.getVariables()) }; - let.visitChild(lambda.getSubterm()); - } else if (mTerm instanceof QuantifiedFormula) { - final QuantifiedFormula quant = (QuantifiedFormula) mTerm; - mInfo.mScopes = new Map[] { let.newScope(quant.getVariables()) }; - if (isPattern(quant.getSubformula())) { - let.visitChild(((AnnotatedTerm) quant.getSubformula()).getSubterm()); - } else { - let.visitChild(quant.getSubformula()); - } - } else if (mTerm instanceof MatchTerm) { - final MatchTerm match = (MatchTerm) mTerm; - final int numCases = match.getCases().length; - mInfo.mScopes = new Map[numCases]; - for (int i = numCases - 1; i >= 0; i--) { - let.enqueueWalker(new CollectMatchCase(match, mInfo, i)); - } - let.visitChild(match.getDataTerm()); - } else { - throw new AssertionError(); - } - } - } - - public static class CollectMatchCase implements Walker { - MatchTerm mTerm; - TermInfo mInfo; - int mCaseNr; - - public CollectMatchCase(final MatchTerm term, final TermInfo info, final int caseNr) { - mTerm = term; - mInfo = info; - mCaseNr = caseNr; - } - - @Override - public void walk(final NonRecursive walker) { - final FormulaLet let = (FormulaLet) walker; - mInfo.mScopes[mCaseNr] = let.newScope(mTerm.getVariables()[mCaseNr]); - let.visitChild(mTerm.getCases()[mCaseNr]); - } - } - - static class Converter implements Walker { - Term mTerm; - - public Converter(final Term term) { - mTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet) engine; - final Term term = mTerm; - final Map scopeInfos = let.mVisited.get(let.findScope(term)); - final TermInfo info = scopeInfos.get(term); - if (info == null) { - let.mResultStack.addLast(term); - } else if (info.mSubst != null) { - let.mResultStack.addLast(info.mSubst); - } else { - let.enqueueWalker(new Transformer(info)); - } - } - } - - public static class TransformMatchCase implements Walker { - MatchTerm mTerm; - TermInfo mInfo; - int mCaseNr; - - public TransformMatchCase(final MatchTerm term, final TermInfo info, final int caseNr) { - mTerm = term; - mInfo = info; - mCaseNr = caseNr; - } - - @Override - public void walk(final NonRecursive walker) { - // TODO - final FormulaLet let = (FormulaLet) walker; - let.addTransformScope(mTerm.getVariables()[mCaseNr], mInfo.mScopes[mCaseNr]); - let.enqueueWalker(new Converter(mTerm.getCases()[mCaseNr])); - } - } - - /** - * This transforms the term into a letted term and puts it on the result stack. It is called by the converter class - * that determines when the term needs to be build, e.g. letted sub terms are only build when the let is going to be - * constructed. - */ - static class Transformer implements Walker { - TermInfo mTermInfo; - - /** - * Create walker to transform the term into a letted term. - * - * @param parent - * The predecessor, or the common ancestor term where the let is placed. - * @param isCounted - * If this is false, we just create a copy of this term, because it could not be letted for some - * reasons. We only count the last copy. - */ - public Transformer(final TermInfo parent) { - mTermInfo = parent; - } - - public void enqueueBuildLetTerms(final FormulaLet let) { - for (final ArrayList letList: mTermInfo.mLettedTerms) { - assert !letList.isEmpty(); - final TermVariable[] tvs = new TermVariable[letList.size()]; - let.enqueueWalker(new BuildLetTerm(tvs)); - int i = 0; - for (final TermInfo info : letList) { - assert info.mSubst != null; - tvs[i++] = info.mSubst; - let.enqueueWalker(new Transformer(info)); - } - } - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = ((FormulaLet) engine); - final Term term = mTermInfo.mTerm; - - enqueueBuildLetTerms(let); - - if (term instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) term; - // enqueue the final walker that rebuilds the quantified term again. - let.enqueueWalker(new BuildLambda(lambda)); - // add the stored scope for the subterm - let.addTransformScope(lambda.getVariables(), mTermInfo.mScopes[0]); - // enqueue a new letter for the sub formula. - let.enqueueWalker(new Converter(lambda.getSubterm())); - } else if (term instanceof QuantifiedFormula) { - // Quantified formulas are handled by a completely new letter. - final QuantifiedFormula quant = (QuantifiedFormula) term; - // enqueue the final walker that rebuilds the quantified term again. - let.enqueueWalker(new BuildQuantifier(quant)); - if (isPattern(quant.getSubformula())) { - // avoid separating a pattern annotation from its quantifier. We do not let the - // terms in the pattern annotation - final AnnotatedTerm at = (AnnotatedTerm) quant.getSubformula(); - // enqueue the final walker that rebuilds the annotated term again. - let.enqueueWalker(new BuildAnnotatedTerm(at)); - // recursively walk the annotation and push the contained terms. - let.addTransformScope(quant.getVariables(), mTermInfo.mScopes[0]); - let.enqueueWalker(new Converter(at.getSubterm())); - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : at.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeFirst(); - if (value instanceof Term) { - let.mResultStack.addLast((Term) value); - } else if (value instanceof Object[]) { - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - } else { - // enqueue a new letter for the sub formula. - let.addTransformScope(quant.getVariables(), mTermInfo.mScopes[0]); - let.enqueueWalker(new Converter(quant.getSubformula())); - } - } else if (term instanceof AnnotatedTerm) { - final AnnotatedTerm at = (AnnotatedTerm) term; - // enqueue the final walker that rebuilds the annotated term again. - let.enqueueWalker(new BuildAnnotatedTerm(at)); - if (isNamed(at)) { - // Named terms are special and are handled by a completely new letter (they must not contain - // variables). - let.enqueueLetter(at.getSubterm()); - } else { - // recursively walk the annotation and convert the contained terms. - let.enqueueWalker(new Converter(at.getSubterm())); - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : at.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeLast(); - if (value instanceof Term) { - let.enqueueWalker(new Converter((Term) value)); - } else if (value instanceof Object[]) { - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - } - } else if (term instanceof ApplicationTerm) { - // enqueue the final walker that rebuilds the application term. - final ApplicationTerm appTerm = (ApplicationTerm) term; - let.enqueueWalker(new BuildApplicationTerm(appTerm)); - // recursively convert the arguments. - final Term[] params = appTerm.getParameters(); - for (int i = params.length - 1; i >= 0; i--) { - let.enqueueWalker(new Converter(params[i])); - } - } else if (term instanceof MatchTerm) { - // enqueue the final walker that rebuilds the application term. - final MatchTerm matchTerm = (MatchTerm) term; - let.enqueueWalker(new BuildMatchTerm(matchTerm)); - // recursively convert the arguments. - final Term[] cases = matchTerm.getCases(); - for (int i = cases.length - 1; i >= 0; i--) { - let.enqueueWalker(new TransformMatchCase(matchTerm, mTermInfo, i)); - } - let.enqueueWalker(new Converter(matchTerm.getDataTerm())); - } else { - // everything else is converted to itself - let.mResultStack.addLast(term); - } - } - } - - /** - * This class checks if there are sub terms that need to be letted. In that case we need to transform the sub terms - * and enqueue a BuildLetTerm that will finally add the let term. - */ - static class CollectLets implements Walker { - final TermInfo mTermInfo; - public CollectLets(final TermInfo parent) { - mTermInfo = parent; - } - - @Override - public void walk(final NonRecursive engine) { - final List lettedTerms = mTermInfo.mLettedTerms.getFirst(); - if (lettedTerms.isEmpty()) { - // no terms want to be letted by us. - mTermInfo.mLettedTerms.removeFirst(); - return; - } - final FormulaLet let = ((FormulaLet) engine); - // Collecting the let definitions may create new letted terms so we need to run - // again. - let.enqueueWalker(this); - mTermInfo.mLettedTerms.addFirst(new ArrayList<>()); - - // now mark the lets in the let definitions. - for (final TermInfo ti : lettedTerms) { - let.enqueueWalker(new MarkLet(ti)); - } - } - } - - /** - * Add a let term around the term on the result stack using the let values also - * from the result stack and put the let term back onto the result stack. - */ - static class BuildLetTerm implements Walker { - final TermVariable[] mVars; - public BuildLetTerm(final TermVariable[] vars) { - mVars = vars; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet)engine; - final Term[] values = new Term[mVars.length]; - for (int i = 0; i < values.length; i++) { - values[i] = let.mResultStack.removeLast(); - } - final Term newBody = let.mResultStack.removeLast(); - final Theory theory = newBody.getTheory(); - final Term result = theory.let(mVars, values, newBody); - let.mResultStack.addLast(result); - } - } - - /** - * Build an application term from the arguments on the result stack and the original function symbol and put the - * result on the result stack. - */ - static class BuildApplicationTerm implements Walker { - final ApplicationTerm mOldTerm; - public BuildApplicationTerm(final ApplicationTerm term) { - mOldTerm = term; - } - - public Term[] getTerms(final FormulaLet let, final Term[] oldArgs) { - Term[] newArgs = oldArgs; - for (int i = oldArgs.length - 1; i >= 0; i--) { - final Term newTerm = let.mResultStack.removeLast(); - if (newTerm != oldArgs[i]) { - if (newArgs == oldArgs) { - newArgs = oldArgs.clone(); - } - newArgs[i] = newTerm; - } - } - return newArgs; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet)engine; - final Term[] newParams = getTerms(let, mOldTerm.getParameters()); - Term result = mOldTerm; - if (newParams != mOldTerm.getParameters()) { - final Theory theory = mOldTerm.getTheory(); - result = theory.term(mOldTerm.getFunction(), newParams); - } - let.mResultStack.addLast(result); - } - } - - /** - * Build a lambda term on the result stack and put the result on the result - * stack. - */ - static class BuildLambda implements Walker { - final LambdaTerm mOldTerm; - - public BuildLambda(final LambdaTerm term) { - mOldTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet) engine; - final Term newBody = let.mResultStack.removeLast(); - Term result = mOldTerm; - if (newBody != mOldTerm.getSubterm()) { - final Theory theory = mOldTerm.getTheory(); - result = theory.lambda(mOldTerm.getVariables(), newBody); - } - let.mResultStack.addLast(result); - } - } - - /** - * Build a quantifier around the term on the result stack and put the result on - * the result stack. - */ - static class BuildQuantifier implements Walker { - final QuantifiedFormula mOldTerm; - public BuildQuantifier(final QuantifiedFormula term) { - mOldTerm = term; - } - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet)engine; - final Term newBody = let.mResultStack.removeLast(); - Term result = mOldTerm; - if (newBody != mOldTerm.getSubformula()) { - final Theory theory = mOldTerm.getTheory(); - if (mOldTerm.getQuantifier() == QuantifiedFormula.EXISTS) { - result = theory.exists(mOldTerm.getVariables(), newBody); - } else { - result = theory.forall(mOldTerm.getVariables(), newBody); - } - } - let.mResultStack.addLast(result); - } - } - - /** - * Build a match term using the terms on the result stack and put the result on the result stack. - */ - static class BuildMatchTerm implements Walker { - final MatchTerm mOldTerm; - - public BuildMatchTerm(final MatchTerm term) { - mOldTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet) engine; - final Term[] oldCases = mOldTerm.getCases(); - Term[] newCases = oldCases; - for (int i = oldCases.length - 1; i >= 0; i--) { - final Term caseTerm = let.mResultStack.removeLast(); - if (caseTerm != oldCases[i]) { - if (newCases == oldCases) { - newCases = oldCases.clone(); - } - newCases[i] = caseTerm; - } - } - final Term newDataTerm = let.mResultStack.removeLast(); - - Term result = mOldTerm; - if (newDataTerm != mOldTerm.getDataTerm() || newCases != oldCases) { - final Theory theory = mOldTerm.getTheory(); - result = theory.match(newDataTerm, mOldTerm.getVariables(), newCases, mOldTerm.getConstructors()); - } - let.mResultStack.addLast(result); - } - } - - /** - * Build an annotated term around the term on the result stack (and all term valued annotations also on result - * stack) and put the result on the result stack. - */ - static class BuildAnnotatedTerm implements Walker { - final AnnotatedTerm mOldTerm; - public BuildAnnotatedTerm(final AnnotatedTerm term) { - mOldTerm = term; - } - - private Object retrieveValue(final FormulaLet let, final Object old) { - if (old instanceof Term) { - return let.mResultStack.removeLast(); - } else if (old instanceof Object[]) { - Object[] newArray = (Object[]) old; - for (int i = newArray.length - 1; i >= 0; i--) { - final Object oldValue = newArray[i]; - final Object newValue = retrieveValue(let, oldValue); - if (oldValue != newValue) { - if (newArray == old) { - newArray = newArray.clone(); - } - newArray[i] = newValue; - } - } - return newArray; - } else { - return old; - } - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = (FormulaLet)engine; - Term result = mOldTerm; - final Term newBody = let.mResultStack.removeLast(); - final Annotation[] oldAnnot = mOldTerm.getAnnotations(); - Annotation[] newAnnot = oldAnnot; - for (int i = oldAnnot.length - 1; i >= 0; i--) { - final Object oldValue = oldAnnot[i].getValue(); - final Object newValue = retrieveValue(let, oldValue); - if (newValue != oldValue) { - if (newAnnot == oldAnnot) { - newAnnot = oldAnnot.clone(); - } - newAnnot[i] = new Annotation(oldAnnot[i].getKey(), newValue); - } - } - if (newBody != mOldTerm.getSubterm() || newAnnot != oldAnnot) { - final Theory theory = mOldTerm.getTheory(); - result = theory.annotatedTerm(newAnnot, newBody); - } - let.mResultStack.addLast(result); - } - } - - /** - * This tells each term about all of its parents and uses this to determine the - * let position for each term. - */ - static class AddParent implements Walker { - TermInfo mParent; - Term mTerm; - - public AddParent(final TermInfo parent, final Term term) { - mParent = parent; - mTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = ((FormulaLet) engine); - final Term child = mTerm; - final Map scopeInfos = let.mVisited.get(let.findScope(child)); - final TermInfo info = scopeInfos.get(child); - if (info == null) { - return; - } - if (info.mParent == null) { - // we don't have a parent yet, set mParent to parent. - info.mParent = mParent; - info.mPDepth = mParent.mPDepth + 1; - if (info.mSubst == null && !(child instanceof LambdaTerm) - && (let.mFilter == null || let.mFilter.isLettable(child)) && info.shouldBuildLet()) { - // this will be letted, so create a new term variable for it. - final Term t = info.mTerm; - info.mSubst = t.getTheory().createTermVariable(".cse" + let.mCseNum++, t.getSort()); - } - } - info.mSeen++; - if (info.mSeen == info.mCount) { - // when we have visited all parents we start visiting the children. - - // merge parents, so that mParent points to the common ancestor of all parents. - // we only have to call it on the last one. - info.mergeParent(mParent); - - if (info.mSubst == null) { - // if the subterm is not substituted, mark the subterm now. - let.enqueueWalker(new MarkLet(info)); - } else { - // otherwise add the subterm to the letted term of its parent. - - // Usually the let position is the common parent, - // but if some ancestor occurs several times without being letted, we need to - // move it to its ancestor to avoid creating the let multiple times. - TermInfo ancestor = info.mParent; - TermInfo letPos = ancestor; - while (ancestor != null && ancestor.mSubst == null) { - if (ancestor.mParent != null && bindsVariable(ancestor.mParent.mTerm, child)) { - // the ancestors' parent binds some of the variables in child, so letPos must - // stay below ancestors' parent. - break; - } - if (ancestor.mCount > 1) { - // ancestor occurs several times. - // let position is the common parent of this ancestor. - letPos = ancestor.mParent; - } - ancestor = ancestor.mParent; - } - // Tell our ancestor, that he needs to let us - letPos.mLettedTerms.getFirst().add(info); - } - } - } - } - - public static class AddParentMatchCase implements Walker { - MatchTerm mTerm; - TermInfo mInfo; - int mCaseNr; - - public AddParentMatchCase(final MatchTerm term, final TermInfo info, final int caseNr) { - mTerm = term; - mInfo = info; - mCaseNr = caseNr; - } - - @Override - public void walk(final NonRecursive walker) { - final FormulaLet let = (FormulaLet) walker; - let.addTransformScope(mTerm.getVariables()[mCaseNr], mInfo.mScopes[mCaseNr]); - let.enqueueWalker(new AddParent(mInfo, mTerm.getCases()[mCaseNr])); - } - } - - /** - * This transforms the term into a letted term and puts it on the result stack. - * It is called by the converter class that determines when the term needs to be - * build, e.g. letted sub terms are only build when the let is going to be - * constructed. - */ - static class MarkLet implements Walker { - TermInfo mTermInfo; - - /** - * Create walker to transform the term into a letted term. - * - * @param parent The predecessor, or the common ancestor term where the let - * is placed. - * @param isCounted If this is false, we just create a copy of this term, - * because it could not be letted for some reasons. We only - * count the last copy. - */ - public MarkLet(final TermInfo parent) { - mTermInfo = parent; - } - - @Override - public void walk(final NonRecursive engine) { - final FormulaLet let = ((FormulaLet) engine); - final Term term = mTermInfo.mTerm; - // Enqueue the walker that will collect the let definitions later so that they - // are collected at the right position. - mTermInfo.mLettedTerms = new ArrayDeque<>(); - mTermInfo.mLettedTerms.addFirst(new ArrayList<>()); - let.enqueueWalker(new CollectLets(mTermInfo)); - - if (term instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) term; - // add the stored scope for the subterm - let.addTransformScope(lambda.getVariables(), mTermInfo.mScopes[0]); - // enqueue a new letter for the sub formula. - let.enqueueWalker(new AddParent(mTermInfo, lambda.getSubterm())); - } else if (term instanceof QuantifiedFormula) { - // Quantified formulas are handled by a completely new letter. - final QuantifiedFormula quant = (QuantifiedFormula) term; - if (isPattern(quant.getSubformula())) { - // avoid separating a pattern annotation from its quantifier. We do not let the - // terms in the pattern annotation - final AnnotatedTerm at = (AnnotatedTerm) quant.getSubformula(); - // recursively walk the annotation and push the contained terms. - let.addTransformScope(quant.getVariables(), mTermInfo.mScopes[0]); - let.enqueueWalker(new AddParent(mTermInfo, at.getSubterm())); - } else { - // enqueue a new letter for the sub formula. - let.addTransformScope(quant.getVariables(), mTermInfo.mScopes[0]); - let.enqueueWalker(new AddParent(mTermInfo, quant.getSubformula())); - } - } else if (term instanceof AnnotatedTerm) { - final AnnotatedTerm at = (AnnotatedTerm) term; - // Named terms are special and are handled by a completely new letter (they must - // not contain variables). - if (!isNamed(at)) { - // recursively walk the annotation and convert the contained terms. - let.enqueueWalker(new AddParent(mTermInfo, at.getSubterm())); - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : at.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeLast(); - if (value instanceof Term) { - let.enqueueWalker(new AddParent(mTermInfo, (Term) value)); - } else if (value instanceof Object[]) { - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - } - } else if (term instanceof ApplicationTerm) { - final ApplicationTerm appTerm = (ApplicationTerm) term; - // recursively walk the arguments. - final Term[] params = appTerm.getParameters(); - for (int i = params.length - 1; i >= 0; i--) { - let.enqueueWalker(new AddParent(mTermInfo, params[i])); - } - } else if (term instanceof MatchTerm) { - final MatchTerm matchTerm = (MatchTerm) term; - // recursively convert the arguments. - final Term[] cases = matchTerm.getCases(); - for (int i = cases.length - 1; i >= 0; i--) { - let.enqueueWalker(new AddParentMatchCase(matchTerm, mTermInfo, i)); - } - let.enqueueWalker(new AddParent(mTermInfo, matchTerm.getDataTerm())); - } else { - // everything else is converted to itself - let.mResultStack.addLast(term); - } - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaUnLet.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaUnLet.java deleted file mode 100644 index 62158a3693f..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaUnLet.java +++ /dev/null @@ -1,368 +0,0 @@ -/* - * Copyright (C) 2009-2022 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.ScopedHashMap; - -/** - * This class removes all let terms from the formula. It's a term transformer - * that transforms a term with lets into an equivalent term without let. - * - * A tricky issue here are variable name clashes that can appear when renaming. - * This class will check whether renaming is necessary, i.e., if a let makes a - * variable with the same name as a bounded variable visible inside the - * quantifier. A simple example is - * {@code (let ((y x)) (exists ((x Int)) (= x y)))}. In this case the variable - * of the inner quantifier is renamed by adding dots in front of it. Note that - * symbols starting with a dot are reserved for solver use. - * - * By renaming in a consistent manner and by only renaming if there is a name - * clash, the unletted form of an assumed term in a proof should be equal to the - * unletted asserted term. - * - * @author Jochen Hoenicke - */ -public class FormulaUnLet extends TermTransformer { - - public enum UnletType { - /** - * The SMTLIB compliant unlet that does not expand definitions. - */ - SMTLIB(false, false), - /** - * The non-SMTLIB compliant unlet that does not expand definitions but - * uses the lazy semantics. - */ - LAZY(true, false), - /** - * The SMTLIB compliant unlet that expands definitions. - */ - EXPAND_DEFINITIONS(false, true); - /** - * True for lazy let semantics. The normal semantics of SMTLIB is - * non-lazy, i.e. the values of a let are evaluated before they are - * assigned to the corresponding variable. With lazy let, the value is - * expanded only when the variable is used later. This was useful once - * for interpolation. - */ - final boolean mIsLazy; - /** - * Should defined functions be expanded. Defaults to false. - */ - final boolean mExpandDefinitions; - UnletType(final boolean lazy, final boolean expandDefinitions) { - mIsLazy = lazy; - mExpandDefinitions = expandDefinitions; - } - } - - /** - * The scoped let map. Each scope corresponds to a partially executed let - * or a quantifier on the todo stack. It gives the mapping for each - * term variable defined in that scope to the corresponding term. - */ - private final ScopedHashMap mLetMap = - new ScopedHashMap<>(false); - - /** - * The type of this unletter. - */ - private final UnletType mType; - - /** - * The converted match variable arrays. - */ - private final ArrayList mMatchVars = new ArrayList<>(); - - /** - * Create a FormulaUnLet with the standard SMT-LIB semantics for let. - */ - public FormulaUnLet() { - this(UnletType.SMTLIB); - } - - /** - * Create a FormulaUnLet. - * @param type The type of the unletter. - */ - public FormulaUnLet(final UnletType type) { - mType = type; - } - - /** - * Add user defined substitutions. This allows to map variables to - * terms, without adding a surrounding let term first. Note that these - * substitutions are then used for all formulas unletted by this class. - * @param termSubst The substitution, which maps term variables to - * the term with which they should be substituted. - */ - public void addSubstitutions(final Map termSubst) { - mLetMap.putAll(termSubst); - } - - /** - * Unlet a term, i.e., remove all LetTerm and replace the term variables - * accordingly. - * @param term the term to unlet - * @return the resulting let-free term. - */ - public Term unlet(final Term term) { - return transform(term); - } - - private boolean isRenamedVar(String name) { - // Renamed variables are of the form .[1-9][0-9]*.originalname. - return name.charAt(0) == '.' && name.charAt(1) >= '1' && name.charAt(1) <= '9'; - } - - private void noteUsage(Map usageMap, TermVariable usedTv) { - /* - * we do bounded renaming on variables. For each variables x, we use the - * internal variables x, .1.x, .2.x, ... The generation is 0 for the original - * variable, otherwise it is the number after the r. We remember the maximum - * generation in usageMap, so that we rename every variable to the next - * generation after it. - */ - String name = usedTv.getName(); - int generation = 0; - if (isRenamedVar(name)) { - final int dotPos = name.indexOf('.', 2); - generation = Integer.valueOf(name.substring(1, dotPos)); - name = name.substring(dotPos + 1); - } - final Integer oldGen = usageMap.put(name, generation); - if (oldGen != null && oldGen > generation) { - usageMap.put(name, oldGen); - } - } - - private String boundedRename(Map usageMap, String name) { - if (isRenamedVar(name)) { - name = name.substring(name.indexOf('.', 2) + 1); - } - final Integer usedOutside = usageMap.get(name); - if (usedOutside == null) { - return name; - } else { - return "." + (usedOutside + 1) + "." + name; - } - } - - /** - * This is called for each quantifier, lambda term, or match term that - * introduces new bound variables. It determines if there is a name clash and - * renamed the bound variables accordingly. It adds the corresponding renaming - * to the let map. - * - * This also adds a new scope to the let map. - * - * @param body The term that contains the bounded variables. - * @param vars The bounded variables that may need to be renamed. - */ - public void startVarScope(final Term body, final TermVariable[] vars) { - /* compute all variables that are indirectly used inside the body */ - final HashMap usedOutside = new HashMap<>(); - final HashSet bodyVars = new HashSet<>(); - bodyVars.addAll(Arrays.asList(body.getFreeVars())); - for (final TermVariable tv : vars) { - bodyVars.remove(tv); - } - for (final TermVariable tv : bodyVars) { - final Term refTerm = mLetMap.get(tv); - if (refTerm == null) { - noteUsage(usedOutside, tv); - } else { - for (final TermVariable usedTv : refTerm.getFreeVars()) { - noteUsage(usedOutside, usedTv); - } - } - } - - mLetMap.beginScope(); - for (int i = 0; i < vars.length; i++) { - final String name = vars[i].getName(); - final String newName = boundedRename(usedOutside, name); - if (newName.equals(name)) { - // remove the name from mLetMap so that it is kept. - if (mLetMap.containsKey(vars[i])) { - mLetMap.remove(vars[i]); - } - } else { - // do bounded renaming. - mLetMap.put(vars[i], vars[i].getTheory().createTermVariable(newName, vars[i].getSort())); - } - } - } - - /** - * Ends a variable scope and determines the renamed bounded variables. - * - * @param vars the bounded variables of the exists, lambda or match term. - * @return the renamed variables in case renaming bounded variables were - * necessary (returns vars if no renaming was necessary). - */ - public TermVariable[] endVarScope(final TermVariable[] vars) { - TermVariable[] newVars = vars; - for (int i = 0; i < vars.length; i++) { - final Term newVar = mLetMap.get(vars[i]); - if (newVar != null) { - if (vars == newVars) { - newVars = vars.clone(); - } - newVars[i] = (TermVariable) newVar; - } - } - mLetMap.endScope(); - return newVars; - } - - @Override - public void convert(final Term term) { - if (term instanceof TermVariable) { - final Term value = mLetMap.get(term); - if (value == null) { - setResult(term); - } else if (mType.mIsLazy) { - pushTerm(value); - } else { - setResult(value); - } - } else if (mType.mIsLazy && term instanceof LetTerm) { - final LetTerm letTerm = (LetTerm) term; - preConvertLet(letTerm, letTerm.getValues()); - } else if (term instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) term; - startVarScope(lambda.getSubterm(), lambda.getVariables()); - super.convert(term); - } else if (term instanceof QuantifiedFormula) { - final QuantifiedFormula qf = (QuantifiedFormula)term; - startVarScope(qf.getSubformula(), qf.getVariables()); - super.convert(term); - } else if (term instanceof ApplicationTerm) { - final ApplicationTerm appTerm = (ApplicationTerm) term; - if (mType.mExpandDefinitions - && appTerm.getFunction().getDefinition() != null) { - final FunctionSymbol defed = appTerm.getFunction(); - final Term fakeLet = appTerm.getTheory().let( - defed.getDefinitionVars(), appTerm.getParameters(), - defed.getDefinition()); - pushTerm(fakeLet); - return; - } - super.convert(term); - } else { - super.convert(term); - } - } - - @Override - public void preConvertLet(final LetTerm oldLet, final Term[] newValues) { - mLetMap.beginScope(); - final TermVariable[] vars = oldLet.getVariables(); - for (int i = 0; i < vars.length; i++) { - mLetMap.put(vars[i], newValues[i]); - } - super.preConvertLet(oldLet, newValues); - } - - @Override - public void postConvertLet(final LetTerm oldLet, final Term[] newValues, final Term newBody) { - setResult(newBody); - mLetMap.endScope(); - } - - /** - * Build the converted formula for a lambda term. This also ends the scope of - * the lambda term. It stores the converted quantifier using - * {@link #setResult(Term)}. - * - * @param old the quantifier to convert. - * @param newBody the converted sub formula. - */ - @Override - public void postConvertLambda(final LambdaTerm old, final Term newBody) { - final TermVariable[] vars = old.getVariables(); - final TermVariable[] newVars = endVarScope(vars); - if (vars == newVars && old.getSubterm() == newBody) { - setResult(old); - } else { - final Theory theory = old.getTheory(); - setResult(theory.lambda(newVars, newBody)); - } - } - - /** - * Build the converted formula for a quantified formula. This also ends the - * scope of the quantifier. It stores the converted quantifier using - * {@link #setResult(Term)}. - * - * @param old the quantifier to convert. - * @param newBody the converted sub formula. - */ - @Override - public void postConvertQuantifier(final QuantifiedFormula old, final Term newBody) { - final TermVariable[] vars = old.getVariables(); - final TermVariable[] newVars = endVarScope(vars); - if (vars == newVars && old.getSubformula() == newBody) { - setResult(old); - } else { - final Theory theory = old.getTheory(); - setResult(old.getQuantifier() == QuantifiedFormula.EXISTS - ? theory.exists(newVars, newBody) - : theory.forall(newVars, newBody)); - } - } - - @Override - public void preConvertMatchCase(final MatchTerm oldMatch, final int caseNr) { - if (caseNr > 0) { - mMatchVars.add(endVarScope(oldMatch.getVariables()[caseNr - 1])); - } - startVarScope(oldMatch.getCases()[caseNr], oldMatch.getVariables()[caseNr]); - super.preConvertMatchCase(oldMatch, caseNr); - } - - @Override - public void postConvertMatch(final MatchTerm oldMatch, final Term newDataTerm, final Term[] newCases) { - assert oldMatch.getCases().length > 0; - mMatchVars.add(endVarScope(oldMatch.getVariables()[oldMatch.getVariables().length - 1])); - final TermVariable[][] oldVars = oldMatch.getVariables(); - TermVariable[][] newVars = null; - for (int i = oldVars.length - 1; i >= 0; i--) { - final TermVariable[] newVarsCase = mMatchVars.remove(mMatchVars.size() - 1); - if (newVarsCase != oldVars[i]) { - if (newVars == null) { - newVars = oldVars.clone(); - } - newVars[i] = newVarsCase; - } - } - if (newVars != null) { - setResult(oldMatch.getTheory().match(newDataTerm, newVars, newCases, oldMatch.getConstructors())); - } else { - super.postConvertMatch(oldMatch, newDataTerm, newCases); - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaWalker.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaWalker.java deleted file mode 100644 index 6c59e7c6d1a..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FormulaWalker.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * A walker according to the visitor pattern. This walker is recursive. Since - * this is dangerous for big terms, it should not be used anymore. Consider - * {@link NonRecursive} or {@link TermTransformer} instead. - * @author Juergen Christ - */ -@Deprecated -public class FormulaWalker { - public interface SymbolVisitor { - /** - * Returns the new term corresponding to input. - * @param input Input term. - * @return OutputTerm or null iff walker should descend - * into subterms (only for ApplicationTerms with arguments and - * ITETerms). - */ - public Term term(Term input); - /** - * Finished descending into arguments of a term. - * @param input Term recently processed. - */ - public void done(Term input); - /** - * Whether flet formulae should be removed or not. - * @return true iff flets should be removed - */ - public boolean unflet(); - /** - * Should let formulae be removed or not. Note that the visitor is - * responsible for substituting TermVariables. - * @return true iff let formulae should be removed. - */ - public boolean unlet(); - /** - * Notification for a discovered let formula. - * @param tv TermVariable bound by this let formula. - * @param mval Modified value of tv. - */ - public void let(TermVariable[] tv,Term[] mval); - /** - * Begin of a quantifier scope. - * @param tvs Variables bound by this quantifier. - */ - public void quantifier(TermVariable[] tvs); - /** - * End scopes of multiple variables. - * @param tv All variables whose scope ends. - */ - public void endscope(TermVariable[] tv); - } - private final SymbolVisitor mVisitor; - - private final Script mScript; - public FormulaWalker(SymbolVisitor visitor, Script script) { - mVisitor = visitor; - mScript = script; - } - - public Term process(Term term) throws SMTLIBException { - return recursivewalk(term); - } - private Term recursivewalk(Term term) throws SMTLIBException { - final Term res = mVisitor.term(term); - if (res != null) { - return res; - } - if (term instanceof LetTerm) { - final LetTerm let = (LetTerm) term; - final Term[] values = let.getValues(); - Term[] newvalues = new Term[values.length]; - boolean changed = false; - for (int i = 0; i < values.length; i++) { - newvalues[i] = recursivewalk(values[i]); - if (newvalues[i] != values[i]) { - changed = true; - } - } - if (!changed) { - newvalues = values; - } - mVisitor.let(let.getVariables(), newvalues); - try { - final Term newsub = recursivewalk(let.getSubTerm()); - return mVisitor.unlet() ? newsub - : newvalues == values && newsub == let.getSubTerm() ? let - : mScript.let(let.getVariables(), newvalues, newsub); - } finally { - mVisitor.endscope(let.getVariables()); - } - } else if (term instanceof QuantifiedFormula) { - final QuantifiedFormula qf = (QuantifiedFormula)term; - final int quantifier = qf.getQuantifier(); - final TermVariable[] vars = qf.getVariables(); - mVisitor.quantifier(vars); - try { - final Term msub = recursivewalk(qf.getSubformula()); - final boolean changed = msub != qf.getSubformula(); - return changed ? qf : mScript.quantifier( - quantifier, vars, msub); - - } finally { - mVisitor.endscope(vars); - } - } else if (term instanceof AnnotatedTerm) { - final AnnotatedTerm annterm = (AnnotatedTerm) term; - final Term sub = recursivewalk(annterm.getSubterm()); - final Annotation[] annots = annterm.getAnnotations(); - Annotation[] newAnnots = annots; - for (int i = 0; i < annots.length; i++) { - final Object value = annots[i].getValue(); - Object newValue; - if (value instanceof Term) { - newValue = recursivewalk((Term) value); - } else if (value instanceof Term[]) { - newValue = recursivewalk((Term[]) value); - } else { - newValue = value; - } - if (newValue != value) { - if (annots == newAnnots) { - newAnnots = annots.clone(); - } - newAnnots[i] = new Annotation(annots[i].getKey(), newValue); - } - } - if (sub == annterm.getSubterm() && newAnnots == annots) { - return term; - } - return mScript.annotate(sub, newAnnots); - } else if (term instanceof ApplicationTerm) { - final ApplicationTerm at = (ApplicationTerm) term; - final Term[] args = at.getParameters(); - final Term[] nargs = recursivewalk(args); - mVisitor.done(term); - return args == nargs ? term : mScript.term( - at.getFunction().getName(),nargs); - } - throw new RuntimeException( - "SymbolVisitor returned null-value for basic term!"); - } - - private Term[] recursivewalk(Term[] args) throws SMTLIBException { - final Term[] nargs = new Term[args.length]; - boolean changed = false; - for (int i = 0; i < args.length; ++i) { - nargs[i] = recursivewalk(args[i]); - if (nargs[i] != args[i]) { - changed = true; - } - } - return changed ? nargs : args; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbol.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbol.java deleted file mode 100644 index 165a9121b50..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbol.java +++ /dev/null @@ -1,385 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents a function symbol. Each function symbol has a name, a sort and - * zero or more parameter sorts. A constant symbol is represented as a function - * symbols with zero parameters. - * - * For parametric functions we create a different FunctionSymbol for every - * instantiation. - * - * @author hoenicke - */ -public class FunctionSymbol { - public static final int INTERNAL = 1; - public static final int LEFTASSOC = (1) << 1; - public static final int RIGHTASSOC = (2) << 1; - public static final int CHAINABLE = (3) << 1;// NOCHECKSTYLE - public static final int PAIRWISE = (4) << 1;// NOCHECKSTYLE - public static final int ASSOCMASK = (7) << 1;// NOCHECKSTYLE - - public static final int RETURNOVERLOAD = 16; - public static final int MODELVALUE = 32; - public static final int UNINTERPRETEDINTERNAL = 64; - public static final int CONSTRUCTOR = 128; - public static final int SELECTOR = 256; - - final String mName; - final String[] mIndices; - final Sort[] mParamSort; - final Sort mReturnSort; - final int mFlags; - final TermVariable[] mDefinitionVars; - final Term mDefinition; - final int mHash; - - FunctionSymbol(String n, String[] i, Sort[] params, Sort result, - TermVariable[] definitionVars, Term definition, int flags) { - mName = n; - mIndices = i; - mParamSort = params; - mReturnSort = result; - mFlags = flags; - mDefinition = definition; - mDefinitionVars = definitionVars; - if (isLeftAssoc() - && (params.length != 2 || !params[0].equalsSort(result))) { - throw new IllegalArgumentException( - "Wrong sorts for left-associative symbol"); - } - if (isRightAssoc() - && (params.length != 2 || !params[1].equalsSort(result))) { - throw new IllegalArgumentException( - "Wrong sorts for right-associative symbol"); - } - if ((isChainable() || isPairwise()) - && (params.length != 2 || !params[0].equalsSort(params[1]) - || !result.equalsSort(getTheory().getBooleanSort()))) { - throw new IllegalArgumentException( - "Wrong sorts for chainable symbol"); - } - int hash = HashUtils.hashJenkins(mName.hashCode(), (Object[]) mParamSort); - if (mIndices != null) { - hash = HashUtils.hashJenkins(hash, (Object[]) mIndices); - } - if (mReturnSort != null) { - hash = HashUtils.hashJenkins(hash, mReturnSort); - } - mHash = hash; - } - - @Override - public int hashCode() { - return mHash; - } - - /** - * Get the name of the function. This is the name as used in an SMTLIB - * script. It can also contain symbols not allowed by the SMTLIB standard. - * In that case the string representation uses | to quote - * the name. The name may not contain | symbols. - * @return the name of the function. - */ - public String getName() { - return mName; - } - - public String[] getIndices() { - return mIndices; - } - /** - * Check whether this function symbol is created by the solver. Symbols - * created by the solver are assumed to be special symbols like - * +, -, or internal symbols only used by the - * solver. - * @return true if and only if the function symbol was flagged as internal. - */ - public boolean isIntern() { - return (mFlags & INTERNAL) != 0; - } - - public boolean isModelValue() { - return (mFlags & MODELVALUE) != 0; - } - - public Theory getTheory() { - return mReturnSort.mSymbol.mTheory; - } - - /** - * @deprecated use getParameterSorts().length - * @return the number of parameters this function takes. - */ - @Deprecated - public int getParameterCount() { - return mParamSort.length; - } - - /** - * @deprecated use getParameterSorts()[i]. - * @param i the parameter number. - * @return the sort of the ith parameter. - */ - @Deprecated - public Sort getParameterSort(int i) { - return mParamSort[i]; - } - /** - * Retrieve the variables used in the definition of this function symbol. - * A definition only exists if the function symbol is a macro created by the - * {@link Script#defineFun(String, TermVariable[], Sort, Term) define-fun} - * command or a :named annotation. - * @return The variables used in the definition of this function symbol or - * null if this function symbol is not a macro. - */ - public TermVariable[] getDefinitionVars() { - return mDefinitionVars; - } - /** - * Retrieve the definition of this function symbol. A definition only - * exists if the function symbol is a macro created by the - * {@link Script#defineFun(String, TermVariable[], Sort, Term) define-fun} - * command or a :named annotation. - * @return The definition of this function symbol or null if - * this function symbol is not a macro. - */ - public Term getDefinition() { - return mDefinition; - } - - /** - * Get the return sort of this function. - * @return the return sort. - */ - public Sort getReturnSort() { - return mReturnSort; - } - - /** - * Get the sort of the parameters for this function. - * @return An array with the parameter sorts. Never write to this array! - */ - public Sort[] getParameterSorts() { - return mParamSort; - } - - private final void checkSort(Term arg, Sort sort) { - final Sort argSort = arg.getSort(); - if (!sort.equalsSort(argSort)) { - if (argSort.toString().equals(sort.toString())) { - throw new SMTLIBException( - "Argument " + arg + " comes from wrong theory."); - } else { - throw new SMTLIBException( - "Argument " + arg + " has type " + argSort - + " but function " + mName + " expects " + sort); - } - } - } - - /** - * Check if this function symbol can be called on the given argument terms. - * This throws an exception if the type check fails. - * @param params the arguments for the function symbols. - */ - public void typecheck(Term[] params) throws SMTLIBException { - assert params.getClass() == Term[].class; - if ((mFlags & (ASSOCMASK)) != 0) { // NOPMD - // All arguments should have the same type. - if (params.length < 2) { - throw new SMTLIBException( - "Function " + mName + " expects at least two arguments."); - } - checkSort(params[0], mParamSort[0]); - checkSort(params[params.length - 1], mParamSort[1]); - final Sort otherSort = isLeftAssoc() ? mParamSort[1] : mParamSort[0]; - for (int i = 1; i < params.length - 1; i++) { - checkSort(params[i], otherSort); - } - } else { - if (params.length != mParamSort.length) { - throw new SMTLIBException( - "Function " + mName + " expects " + mParamSort.length - + " arguments."); - } - for (int i = 0; i < mParamSort.length; i++) { - checkSort(params[i], mParamSort[i]); - } - } - } - - /** - * Check if this function symbol can be called on terms with the given sort. - * @param params the sort of the arguments for the function symbols. - * @return true if the type check succeeds, false otherwise. - */ - public boolean typecheck(Sort[] params) { - if ((mFlags & (ASSOCMASK)) != 0) { // NOPMD - assert (mParamSort.length == 2); - if (params.length < 2) { - return false; - } - if (!params[0].equalsSort(mParamSort[0])) { - return false; - } - if (!params[params.length - 1].equalsSort(mParamSort[1])) { - return false; - } - final Sort otherSort = isLeftAssoc() ? mParamSort[1] : mParamSort[0]; - for (int i = 1; i < params.length - 1; i++) { - if (!params[i].equalsSort(otherSort)) { - return false; - } - } - } else { - if (params.length != mParamSort.length) { - return false; - } - for (int i = 0; i < mParamSort.length; i++) { - if (!params[i].equalsSort(mParamSort[i])) { - return false; - } - } - } - return true; - } - - /** - * Returns a string representation of this object. This is a SMTLIB - * like representation of the following form: - * 
(name paramsort1 ... paramsortn returnsort)
- * where name is the (possibly indexed and quoted) function name. - */ - @Override - public String toString() { - final StringBuffer sb = new StringBuffer(); - final String name = PrintTerm.quoteIdentifier(mName); - sb.append('('); - if (mIndices == null) { - sb.append(name); - } else { - sb.append("(_ ").append(name); - for (final String i : mIndices) { - sb.append(' ').append(i); - } - sb.append(')'); - } - for (final Sort s : mParamSort) { - sb.append(' ').append(s); - } - sb.append(' ').append(mReturnSort); - sb.append(')'); - return sb.toString(); - } - - /** - * Checks if this function symbol was declared as chainable. - * This should only be true for the internal equality function. - * @return true if the function symbol is chainable. - */ - public final boolean isChainable() { - return (mFlags & ASSOCMASK) == CHAINABLE; - } - /** - * Checks if this function symbol was declared as pairwise. - * This should only be true for the internal distinct function. - * @return true if the function symbol is pairwise. - */ - public final boolean isPairwise() { - return (mFlags & ASSOCMASK) == PAIRWISE; - } - /** - * Checks if this function symbol was declared as left associative. - * This should only be true for internal function symbols. - * @return true if the function symbol is left associative. - */ - public final boolean isLeftAssoc() { - return (mFlags & ASSOCMASK) == LEFTASSOC; - } - /** - * Checks if this function symbol was declared as right associative. - * This should only be true for internal function symbols. - * @return true if the function symbol is right associative. - */ - public final boolean isRightAssoc() { - return (mFlags & ASSOCMASK) == RIGHTASSOC; - } - - /** - * Checks if this function symbol was created with the SMTLIB - * syntax (as name sort) to give it a different result - * sort. - * @return true if the sort was explicitly given, false if it is implicit. - */ - public final boolean isReturnOverload() { - return (mFlags & RETURNOVERLOAD) != 0; - } - - /** - * Get the string representation of this function symbol as it would - * be used to build an application term. - * @return the string representation. - */ - public String getApplicationString() { - final String name = PrintTerm.quoteIdentifier(mName); - if (mIndices == null && !isReturnOverload()) { - return name; - } - final StringBuffer sb = new StringBuffer(); - if (isReturnOverload()) { - sb.append("(as "); - } - if (mIndices != null) { - sb.append("(_ "); - } - sb.append(name); - if (mIndices != null) { - for (final String i : mIndices) { - sb.append(' ').append(i); - } - sb.append(')'); - } - if (isReturnOverload()) { - sb.append(' ').append(getReturnSort()).append(')'); - } - return sb.toString(); - } - /** - * Check whether this function symbol is an internal symbol that has a fixed - * semantic. - * @return true if and only if the symbol is an internal symbol with a fixed - * semantic. - */ - public boolean isInterpreted() { - return isModelValue() - || (isIntern() && (mFlags & UNINTERPRETEDINTERNAL) == 0); - } - - public boolean isConstructor() { - return (mFlags & CONSTRUCTOR) != 0; - } - - public boolean isSelector() { - return (mFlags & SELECTOR) != 0; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbolFactory.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbolFactory.java deleted file mode 100644 index a9e8466633c..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/FunctionSymbolFactory.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigInteger; -import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.UnifyHash; - -/** - * Factory for overloaded and/or polymorphic function symbols. - * @author hoenicke - */ -public abstract class FunctionSymbolFactory { - String mFuncName; - UnifyHash mInstances; - - public FunctionSymbolFactory(String name) { - mFuncName = name; - mInstances = new UnifyHash(); - } - - public abstract Sort getResultSort( - String[] indices, Sort[] paramSorts, Sort resultSort); - - public int getFlags(String[] indices, Sort[] paramSorts, Sort result) { - return FunctionSymbol.INTERNAL; - } - - private static boolean isReal(Sort[] sorts) { - for (final Sort s : sorts) { - if (s.getRealSort() != s) { - return false; - } - } - return true; - } - - public Term getDefinition(TermVariable[] tvs, Sort resultSort) { // NOPMD - return null; - } - - public FunctionSymbol getFunctionWithResult( - Theory theory, String[] indices, Sort[] paramSorts, - Sort resultSort) { - assert isReal(paramSorts); - final int flags = getFlags(indices, paramSorts, resultSort); - if ((flags & (FunctionSymbol.ASSOCMASK)) != 0) { - if (paramSorts.length < 2) { - return null; - } - final Sort[] realParams = new Sort[] { - paramSorts[0], paramSorts[paramSorts.length - 1] - }; - final Sort otherSort = - (flags & (FunctionSymbol.ASSOCMASK)) == FunctionSymbol.LEFTASSOC - ? realParams[1] : realParams[0]; - for (int i = 1; i < paramSorts.length - 1; i++) { - if (paramSorts[i] != otherSort) { - return null; - } - } - paramSorts = realParams; - } - if (((flags & (FunctionSymbol.RETURNOVERLOAD)) == 0) - != (resultSort == null)) { - /* According to standard the return type must be given - * if and only if the function is overloaded on the return type. - */ - return null; - } - final int hash = Arrays.hashCode(indices) - ^ Arrays.hashCode(paramSorts) - ^ (resultSort == null ? 0 : resultSort.hashCode()); - for (final FunctionSymbol func : mInstances.iterateHashCode(hash)) { - if (Arrays.equals(func.mIndices, indices) - && Arrays.equals(func.mParamSort, paramSorts) - && (resultSort == null - || func.mReturnSort == resultSort)) { - return func; - } - } - - resultSort = getResultSort(indices, paramSorts, resultSort); - if (resultSort == null) { - return null; - } - - TermVariable[] defVars = new TermVariable[paramSorts.length]; - for (int i = 0; i < paramSorts.length; i++) { - defVars[i] = theory.createTermVariable("x" + i, paramSorts[i]); - } - Term definition; - if (((flags & (FunctionSymbol.RETURNOVERLOAD)) != 0)// NOPMD - && resultSort != resultSort.getRealSort()) { - final FunctionSymbol realFunc = - getFunctionWithResult(theory, indices, paramSorts, - resultSort.getRealSort()); - definition = theory.term(realFunc, defVars); - } else { - definition = getDefinition(defVars, resultSort); - } - if (definition == null) { - defVars = null; - } - final FunctionSymbol func = new FunctionSymbol( - mFuncName, indices, paramSorts, resultSort, - defVars, definition, flags); - mInstances.put(hash, func); - return func; - } - - @Override - public String toString() { - return mFuncName; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/INonSolverScript.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/INonSolverScript.java deleted file mode 100644 index 2bdff8aa98d..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/INonSolverScript.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * Empty interface that can be used to mark subclasses of {@link Script} that cannot answer check-sat queries. (E.g. - * classes that are only used for building {@link Term}s during parsing.) - *

- * Note that this class is a symptom of an architectural problem: Some subclasses of Script are used as an interface to - * an actual SMT solver ({@link SMTInterpol}, {@link Scriptor}), other subclasses are used only for parsing and - * building {@link Term}s). - * Once the Script class is split according to these functionalities, this interface should become obsolete. - * - * @author Alexander Nutz (nutz@informatik.uni-freiburg.de) - */ -public interface INonSolverScript { - -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAConstantFormatter.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAConstantFormatter.java deleted file mode 100644 index 7fe6e8415e1..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAConstantFormatter.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; - -public class IRAConstantFormatter extends TermTransformer { - - @Override - protected void convert(Term term) { - if (term instanceof ConstantTerm) { - final ConstantTerm ct = (ConstantTerm) term; - Rational rat = null; - if (ct.getValue() instanceof Rational) { - rat = (Rational) ct.getValue(); - } else if (ct.getValue() instanceof BigDecimal) { - final BigDecimal val = (BigDecimal) ct.getValue(); - final int scale = val.scale(); - final BigInteger unscaled = val.unscaledValue(); - final BigInteger scaler = BigInteger.TEN.pow(scale); - rat = Rational.valueOf(unscaled, scaler); - } else if (ct.getValue() instanceof BigInteger) { - rat = Rational.valueOf( - (BigInteger) ct.getValue(), BigInteger.ONE); - } else { - setResult(ct); - return; - } - setResult(ct.getTheory().modelRational(rat, ct.getSort())); - } else { - super.convert(term); - } - } - -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAWrapperFactory.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAWrapperFactory.java deleted file mode 100644 index 53957f80abf..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IRAWrapperFactory.java +++ /dev/null @@ -1,109 +0,0 @@ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.UnifyHash; - -/** - * Factory for creating wrapper functions that handle the IRA syntactic sugar rules. The SMTLIB standard permits to call - * a function with two Real arguments with a mixture of Int and Real. This is syntactic sugar for casting the Int - * parameters to Real using the to_real function. This factory creates wrapper function symbols with the correct mixture - * of Int and Real arguments. These are defined functions and their function definition calls the original function - * symbol with the correct to_real casts. - * - * @author Jochen Hoenicke - */ -public class IRAWrapperFactory { - final UnifyHash mInstances = new UnifyHash<>(); - - /** - * Create an IRA wrapper function for name for the given parameter sorts. This is a new function symbol whose - * definition casts all integer parameters to real parameters using the {@code to_real} function. If the parameter - * count does not match, or if not all parameters are real or integer this returns null. - * - * For associative functions this creates a wrapper for every used sequence of sorts. E.g., it may create the - * function {@code (define-fun + ((Real a) (Int b) (Real c)) (+ a (to_real b) c))}. - * - * @param theory - * the underlying theory. - * @param name - * the unwrapped function symbol. It is assumed that it takes two real parameters except for "ite". - * @param indices - * optional indices, null for no indices. - * @param paramSorts - * the parameter sorts for the wrapper function. - * @param resultType - * the result type specified by SMTLIB {@code (as ..)}; null if no result type specified. - * @return null if an error occured, otherwise the wrapping function symbol. - */ - public FunctionSymbol createWrapper(Theory theory, String name, final String[] indices, Sort[] paramSorts, - final Sort resultType) { - final Sort realSort = theory.getRealSort(); - final Sort intSort = theory.getNumericSort(); - final FunctionSymbol fsym; - /* - * First check that paramSorts is correct. - */ - if (name.equals(SMTLIBConstants.ITE) && indices == null) { - /* ite expects a bool and two int/real mixed arguments. */ - if (paramSorts[0] != theory.getBooleanSort()) { - return null; - } - if ((paramSorts[1] != intSort || paramSorts[2] != realSort) - && (paramSorts[1] != realSort || paramSorts[2] != intSort)) { - return null; - } - /* Create the base function symbol. */ - fsym = theory.getFunctionWithResult(name, indices, resultType, - new Sort[] { theory.getBooleanSort(), realSort, realSort }); - } else { - /* Else all arguments must be Int or Real. */ - boolean hasInt = false; - boolean hasReal = false; - for (int i = 0; i < paramSorts.length; i++) { - if (paramSorts[i] == intSort) { - hasInt = true; - } else if (paramSorts[i] == realSort) { - hasReal = true; - } else { - return null; - } - } - /* At least one must be Int and -- except for division -- one must be Real. */ - if (!hasInt || (!hasReal && !name.equals(SMTLIBConstants.DIVIDE))) { - return null; - } - /* Create the base function symbol. */ - fsym = theory.getFunctionWithResult(name, indices, resultType, realSort, realSort); - /* Check if the number of parameters is two or the symbol is associative. */ - if (paramSorts.length != 2 && (fsym.mFlags & FunctionSymbol.ASSOCMASK) == 0) { - throw new SMTLIBException("Function " + name + " is not associative."); - } - } - - /* Check if we already created a wrapper and return it. */ - final int hash = fsym.hashCode() ^ Arrays.hashCode(paramSorts); - for (final FunctionSymbol func : mInstances.iterateHashCode(hash)) { - if (((ApplicationTerm) func.getDefinition()).getFunction() == fsym - && Arrays.equals(func.mParamSort, paramSorts)) { - return func; - } - } - - /* Create the wrapping definition */ - final TermVariable[] defVars = new TermVariable[paramSorts.length]; - final Term[] wrappedArgs = new Term[paramSorts.length]; - for (int i = 0; i < paramSorts.length; i++) { - defVars[i] = theory.createTermVariable("x" + i, paramSorts[i]); - wrappedArgs[i] = paramSorts[i] == intSort ? theory.term("to_real", defVars[i]) : defVars[i]; - } - final Term definition = theory.term(fsym, wrappedArgs); - assert definition != null; - - /* Create the function symbol */ - final FunctionSymbol wrapper = new FunctionSymbol(fsym.getName(), fsym.getIndices(), paramSorts, fsym.getReturnSort(), - defVars, definition, (fsym.mFlags & ~FunctionSymbol.ASSOCMASK)); - mInstances.put(hash, wrapper); - return wrapper; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IsConstructorFactory.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IsConstructorFactory.java deleted file mode 100644 index a1232b064fa..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/IsConstructorFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.uni_freiburg.informatik.ultimate.logic; - -public class IsConstructorFactory extends FunctionSymbolFactory { - - public IsConstructorFactory() { - super(SMTLIBConstants.IS); - } - - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices.length != 1 || paramSorts.length != 1) { - return null; - } - - if (!paramSorts[0].getSortSymbol().isDatatype()) { - return null; - } - - final DataType datatype = (DataType) paramSorts[0].getSortSymbol(); - for (int i = 0; i < datatype.getConstructors().length; i++) { - if (indices[0].equals(datatype.getConstructors()[i].getName())) { - return paramSorts[0].getTheory().getBooleanSort(); - } - } - return null; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LambdaTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LambdaTerm.java deleted file mode 100644 index 65bf231543c..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LambdaTerm.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -//import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents a lambda term SMTLIB 3. This class represents the SMTLIB 3 - * construct - * - * 

- * (lambda ((var_1 sort_1) ... (var_n sort_n)) term)
- *
- * - * @author hoenicke - */ -public class LambdaTerm extends Term { - private final TermVariable[] mVariables; - private final Term mSubTerm; - private final Sort mSort; - - LambdaTerm(final TermVariable[] vars, final Term subterm, final int hash) { - super(hash); - mVariables = vars; - mSubTerm = subterm; - Sort mySort = subterm.getSort(); - for (int i = vars.length - 1; i >= 0; i--) { - mySort = mySort.getTheory().getSort(SMTLIBConstants.FUNC, vars[i].getSort(), mySort); - } - mSort = mySort; - } - - /** - * Get the quantified variables. - * @return the variables - */ - public TermVariable[] getVariables() { - return mVariables; - } - - /** - * Get the formula under the quantifier. - * @return the sub-formula. - */ - public Term getSubterm() { - return mSubTerm; - } - - @Override - public Sort getSort() { - return mSort; - } - - public static final int hashLambda(final TermVariable[] vars, final Term f) { - return HashUtils.hashJenkins(f.hashCode(), (Object[]) vars); - } - - @Override - public void toStringHelper(final ArrayDeque mTodo) { - // Add subterm to stack. - mTodo.addLast(")"); - mTodo.addLast(getSubterm()); - mTodo.addLast(")) "); - - // Add variables - final TermVariable[] vars = getVariables(); - for (int i = vars.length - 1; i > 0; i--) { - mTodo.addLast(vars[i].getSort()); - mTodo.addLast(") (" + vars[i] + " "); - } - mTodo.addLast(vars[0].getSort()); - - // Print out the quantifier. - mTodo.addLast("(lambda ((" + vars[0] + " "); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LetTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LetTerm.java deleted file mode 100644 index 64a4157065a..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LetTerm.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -//import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Representation of a let term. This class represents the SMTLIB 2 construct - * 
- * (let ((var_0 val_0) ... (var_n val_n)) ...)
- *
- * - * A let term is created by {@link Script#let(TermVariable[], Term[], Term)}. - * - * @author hoenicke - */ -public class LetTerm extends Term { - private final TermVariable[] mVariables; - private final Term[] mValues; - private final Term mSubterm; - private final Sort mSort; - - /** - * @return The variables - */ - public TermVariable[] getVariables() { - return mVariables; - } - - /** - * @return The values - */ - public Term[] getValues() { - return mValues; - } - - /** - * @return The subformula - */ - public Term getSubTerm() { - return mSubterm; - } - - LetTerm(TermVariable[] vars, Term[] vals, Term t, int hash) { - super(hash); - mVariables = vars; - mValues = vals; - mSubterm = t; - mSort = t.getSort(); - } - - @Override - public Sort getSort() { - return mSort; - } - - public static final int hashLet( - TermVariable[] vars, Term[] values, Term subform) { -// return Arrays.hashCode(vars) ^ Arrays.hashCode(values) ^ -// subform.hashCode(); - return HashUtils.hashJenkins( - HashUtils.hashJenkins(subform.hashCode(), (Object[]) values), - (Object[]) vars); - } - - @Override - public void toStringHelper(ArrayDeque mTodo) { - // Add subterm to stack. - mTodo.addLast(")"); - mTodo.addLast(getSubTerm()); - mTodo.addLast(")) "); - // Add assigned values to stack - final TermVariable[] vars = getVariables(); - final Term[] values = getValues(); - for (int i = values.length - 1; i > 0; i--) { - mTodo.addLast(values[i]); - mTodo.addLast(") (" + vars[i].toString() + " "); - } - mTodo.addLast(values[0]); - mTodo.addLast("(let ((" + vars[0].toString() + " "); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LoggingScript.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LoggingScript.java deleted file mode 100644 index b8ec0a4b926..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/LoggingScript.java +++ /dev/null @@ -1,562 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.util.Map; -import java.util.zip.GZIPOutputStream; - -/** - * A logging script variant. This is actually a wrapper around a concrete implementation of the {@link Script} interface - * that produces an interaction file in (almost) SMTLIB 2 compliant format. We still have some extra commands like - * "simplify", "reset", or "get-interpolants". - * - * @author Juergen Christ - */ -public class LoggingScript extends WrapperScript { - - /** - * The interaction log writer. - */ - private final PrintWriter mPw; - - /** - * The auxiliary class to print terms and sorts. - */ - private final PrintTerm mTermPrinter = new PrintTerm(); - - /** - * Common subexpression elimination support if requeste by user. Will be null if cse should not be - * performed. - */ - private final FormulaLet mLetter; - - /** - * Create a new script logging the commands by the user. Most commands are not supported, e.g., checkSat always - * returns unknown. Furthermore, common subexpression elimination is not used in the output. - * - * @param file - * The name of the logging file (should end in .smt2). - * @param autoFlush - * Automatically flush the output stream after every command. - * @throws IOException - * IOException If an I/O error has occurred. - */ - public LoggingScript(final String file, final boolean autoFlush) throws IOException { - this(new NoopScript(), file, autoFlush); - } - - /** - * Create a new script logging the commands by the user. Most commands are not supported, e.g., checkSat always - * returns unknown. This constructor can be used to set up logging using common subexpression elimination. - * - * @param file - * The name of the logging file (should end in .smt2). - * @param autoFlush - * Automatically flush the output stream after every command. - * @param useCSE - * Use common subexpression elimination in output (introduces let terms) - * @throws IOException - * IOException If an I/O error has occurred. - */ - public LoggingScript(final String file, final boolean autoFlush, final boolean useCSE) throws IOException { - this(new NoopScript(), file, autoFlush, useCSE); - } - - /** - * Create a new script logging the interaction between the user and the wrapped script into a file. This constructor - * sets up logging to not use common subexpression elimination. - * - * @param script - * The wrapped script. - * @param file - * The name of the logging file (should end in .smt2). - * @param autoFlush - * Automatically flush the output stream after every command. - * @throws IOException - * IOException If an I/O error has occurred. - */ - public LoggingScript(final Script script, final String file, final boolean autoFlush) throws IOException { - this(script, file, autoFlush, false); - } - - /** - * Create a new script logging the interaction between the user and the wrapped script into a file. This constructor - * can be used to set up logging using common subexpression elimination. - * - * @param script - * The wrapped script. - * @param file - * The name of the logging file (should end in .smt2). - * @param autoFlush - * Automatically flush the output stream after every command. - * @param useCSE - * Use common subexpression elimination in output (introduces let terms) - * @throws IOException - * IOException If an I/O error has occurred. - */ - public LoggingScript(final Script script, final String file, final boolean autoFlush, final boolean useCSE) - throws IOException { - super(script); - OutputStream out; - if (file.equals("")) { - out = System.out; - } else if (file.equals("")) { - out = System.err; - } else { - out = new FileOutputStream(file); - if (file.endsWith(".gz")) { - out = new GZIPOutputStream(out); - } - } - mPw = new PrintWriter(new BufferedWriter(new OutputStreamWriter(out)), autoFlush); - mLetter = useCSE ? new FormulaLet() : null; - } - - private final Term formatTerm(final Term input) { - return mLetter == null ? input : new FormulaLet().let(input); - } - - @Override - public void setLogic(final String logic) throws UnsupportedOperationException, SMTLIBException { - mPw.println("(set-logic " + logic + ")"); - super.setLogic(logic); - } - - @Override - public void setLogic(final Logics logic) throws UnsupportedOperationException, SMTLIBException { - mPw.println("(set-logic " + logic.name() + ")"); - super.setLogic(logic); - } - - @Override - public void setOption(final String opt, final Object value) throws UnsupportedOperationException, SMTLIBException { - mPw.print("(set-option "); - mPw.print(opt); - mPw.print(' '); - mPw.print(PrintTerm.quoteObjectIfString(value)); - mPw.println(")"); - super.setOption(opt, value); - } - - @Override - public void setInfo(final String info, final Object value) { - mPw.print("(set-info "); - mPw.print(info); - mPw.print(' '); - mPw.print(PrintTerm.quoteObjectIfString(value)); - mPw.println(")"); - super.setInfo(info, value); - } - - @Override - public FunctionSymbol getFunctionSymbol(final String constructor) { - return mScript.getFunctionSymbol(constructor); - } - - @Override - public void declareSort(final String sort, final int arity) throws SMTLIBException { - mPw.print("(declare-sort "); - mPw.print(PrintTerm.quoteIdentifier(sort)); - mPw.print(' '); - mPw.print(arity); - mPw.println(")"); - super.declareSort(sort, arity); - } - - @Override - public void defineSort(final String sort, final Sort[] sortParams, final Sort definition) throws SMTLIBException { - mPw.print("(define-sort "); - mPw.print(PrintTerm.quoteIdentifier(sort)); - mPw.print(" ("); - String sep = ""; - for (final Sort p : sortParams) { - mPw.print(sep); - mTermPrinter.append(mPw, p); - sep = " "; - } - mPw.print(") "); - mTermPrinter.append(mPw, definition); - mPw.println(")"); - super.defineSort(sort, sortParams, definition); - } - - @Override - public void declareDatatype(final DataType datatype, final DataType.Constructor[] constrs) throws SMTLIBException { - assert datatype.mNumParams == 0; - mPw.print("(declare-datatype "); - mPw.print(PrintTerm.quoteIdentifier(datatype.getName())); - mPw.print(" ("); - for (int j = 0; j < constrs.length; j++) { - mPw.print("("); - mPw.print(PrintTerm.quoteIdentifier(constrs[j].getName())); - for (int k = 0; k < constrs[j].getArgumentSorts().length; k++) { - mPw.print(" "); - mPw.print("("); - mPw.print(PrintTerm.quoteIdentifier(constrs[j].getSelectors()[k])); - mPw.print(" "); - mPw.print(constrs[j].getArgumentSorts()[k]); - mPw.print(")"); - } - mPw.print(j != constrs.length - 1 ? ") " : ")"); - } - mPw.println("))"); - super.declareDatatype(datatype, constrs); - } - - @Override - public void declareDatatypes(final DataType[] datatypes, final DataType.Constructor[][] constrs, - final Sort[][] sortParams) throws SMTLIBException { - assert datatypes.length == constrs.length && datatypes.length == sortParams.length; - mPw.print("(declare-datatypes ("); - String sep1 = ""; - for (final DataType datatype : datatypes) { - mPw.print(sep1); - sep1 = " "; - mPw.print("("); - mPw.print(PrintTerm.quoteIdentifier(datatype.getName())); - mPw.print(" "); - mPw.print(datatype.mNumParams); - mPw.print(")"); - } - mPw.print(") ("); - String sep2 = ""; - for (int i = 0; i < constrs.length; i++) { - mPw.print(sep2); - sep2 = " "; - if (sortParams[i] != null) { - mPw.print("(par ("); - String sep3 = ""; - for (final Sort param : sortParams[i]) { - mPw.print(sep3); - sep3 = " "; - mPw.print(param); - } - mPw.print(") "); - } - mPw.print("("); - String sep4 = ""; - for (final DataType.Constructor constructor : constrs[i]) { - mPw.print(sep4); - sep4 = " "; - mPw.print("("); - mPw.print(PrintTerm.quoteIdentifier(constructor.getName())); - for (int j = 0; j < constructor.getArgumentSorts().length; j++) { - mPw.print(" "); - mPw.print("("); - mPw.print(PrintTerm.quoteIdentifier(constructor.getSelectors()[j])); - mPw.print(" "); - mPw.print(constructor.getArgumentSorts()[j]); - mPw.print(")"); - } - mPw.print(")"); - } - mPw.print(")"); - if (sortParams[i] != null) { - mPw.print(")"); - } - } - mPw.println("))"); - super.declareDatatypes(datatypes, constrs, sortParams); - } - - @Override - public void declareFun(final String fun, final Sort[] paramSorts, final Sort resultSort) throws SMTLIBException { - mPw.print("(declare-fun "); - mPw.print(PrintTerm.quoteIdentifier(fun)); - mPw.print(" ("); - String sep = ""; - for (final Sort p : paramSorts) { - mPw.print(sep); - mTermPrinter.append(mPw, p); - sep = " "; - } - mPw.print(") "); - mTermPrinter.append(mPw, resultSort); - mPw.println(")"); - super.declareFun(fun, paramSorts, resultSort); - } - - @Override - public void defineFun(final String fun, final TermVariable[] params, final Sort resultSort, final Term definition) - throws SMTLIBException { - mPw.print("(define-fun "); - mPw.print(PrintTerm.quoteIdentifier(fun)); - mPw.print(" ("); - String sep = "("; - for (final TermVariable t : params) { - mPw.print(sep); - mPw.print(t); - mPw.print(' '); - mTermPrinter.append(mPw, t.getSort()); - mPw.print(')'); - sep = " ("; - } - mPw.print(") "); - mTermPrinter.append(mPw, resultSort); - mPw.print(' '); - mTermPrinter.append(mPw, formatTerm(definition)); - mPw.println(")"); - super.defineFun(fun, params, resultSort, definition); - } - - @Override - public void push(final int levels) throws SMTLIBException { - mPw.println("(push " + levels + ")"); - super.push(levels); - } - - @Override - public void pop(final int levels) throws SMTLIBException { - mPw.println("(pop " + levels + ")"); - super.pop(levels); - } - - @Override - public LBool assertTerm(final Term term) throws SMTLIBException { - mPw.print("(assert "); - mTermPrinter.append(mPw, formatTerm(term)); - mPw.println(")"); - return super.assertTerm(term); - } - - @Override - public LBool checkSat() throws SMTLIBException { - mPw.println("(check-sat)"); - return super.checkSat(); - } - - @Override - public LBool checkSatAssuming(final Term... assumptions) throws SMTLIBException { - mPw.print("(check-sat-assuming ("); - String sep = ""; - for (final Term t : assumptions) { - mPw.print(sep); - mTermPrinter.append(mPw, formatTerm(t)); - sep = " "; - } - mPw.println("))"); - return super.checkSatAssuming(assumptions); - } - - @Override - public Term[] getAssertions() throws SMTLIBException { - mPw.println("(get-assertions)"); - return super.getAssertions(); - } - - @Override - public Term getProof() throws SMTLIBException, UnsupportedOperationException { - mPw.println("(get-proof)"); - return super.getProof(); - } - - @Override - public Term[] getUnsatCore() throws SMTLIBException, UnsupportedOperationException { - mPw.println("(get-unsat-core)"); - return super.getUnsatCore(); - } - - @Override - public Map getValue(final Term[] terms) throws SMTLIBException, UnsupportedOperationException { - mPw.print("(get-value ("); - String sep = ""; - for (final Term t : terms) { - mPw.print(sep); - mTermPrinter.append(mPw, formatTerm(t)); - sep = " "; - } - mPw.println("))"); - return super.getValue(terms); - } - - @Override - public Assignments getAssignment() throws SMTLIBException, UnsupportedOperationException { - mPw.println("(get-assignment)"); - return super.getAssignment(); - } - - @Override - public Object getOption(final String opt) throws UnsupportedOperationException { - mPw.println("(get-option " + opt + ")"); - return super.getOption(opt); - } - - @Override - public Object getInfo(final String info) throws UnsupportedOperationException { - mPw.println("(get-info " + info + ")"); - return super.getInfo(info); - } - - @Override - public Term simplify(final Term term) throws SMTLIBException { - mPw.print("(simplify "); - mTermPrinter.append(mPw, term); - mPw.println(")"); - return super.simplify(term); - } - - @Override - public void reset() { - mPw.println("(reset)"); - super.reset(); - } - - @Override - public Term[] getInterpolants(final Term[] partition) throws SMTLIBException, UnsupportedOperationException { - mPw.print("(get-interpolants"); - for (final Term t : partition) { - mPw.print(' '); - mTermPrinter.append(mPw, t); - } - mPw.println(')'); - return super.getInterpolants(partition); - } - - private void printInterpolantQuery(final Term[] partition, final int[] startOfSubtree) { - // Grammar for tree interpolation: - // tree ::= children term - // children ::= tree ('(' tree ')')* - // - // So the an open parenthesis marks the beginning of a new sibling. - // example: parent c, children a, b. - // partitions: [a,b,c] - // startofSubtree: [0,1,0] - // textual representation: a (b) c - mTermPrinter.append(mPw, partition[0]); - for (int i = 1; i < partition.length; ++i) { - int prevStart = startOfSubtree[i - 1]; - while (startOfSubtree[i] < prevStart) { - mPw.print(')'); - prevStart = startOfSubtree[prevStart - 1]; - } - mPw.print(' '); - if (startOfSubtree[i] == i) { - mPw.print('('); - } - mTermPrinter.append(mPw, partition[i]); - } - } - - @Override - public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree) - throws SMTLIBException, UnsupportedOperationException { - mPw.print("(get-interpolants "); - printInterpolantQuery(partition, startOfSubtree); - mPw.println(')'); - return super.getInterpolants(partition, startOfSubtree); - } - - @Override - public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) - throws SMTLIBException, UnsupportedOperationException { - mPw.print("(get-interpolants "); - printInterpolantQuery(partition, startOfSubtree); - mPw.print(" :proof "); - mTermPrinter.append(mPw, proofTree); - mPw.println(')'); - return super.getInterpolants(partition, startOfSubtree); - } - - @Override - public void exit() { - mPw.println("(exit)"); - mPw.flush(); - mPw.close(); - super.exit(); - } - - @Override - public Model getModel() throws SMTLIBException, UnsupportedOperationException { - mPw.println("(get-model)"); - return super.getModel(); - } - - @Override - public Iterable checkAllsat(final Term[] predicates) throws SMTLIBException, UnsupportedOperationException { - final PrintTerm pt = new PrintTerm(); - mPw.print("(check-allsat ("); - String spacer = ""; - for (final Term p : predicates) { - mPw.print(spacer); - pt.append(mPw, p); - spacer = " "; - } - mPw.println("))"); - return super.checkAllsat(predicates); - } - - @Override - public Term[] findImpliedEquality(final Term[] x, final Term[] y) { - final PrintTerm pt = new PrintTerm(); - mPw.print("(find-implied-equality ("); - String spacer = ""; - for (final Term p : x) { - mPw.print(spacer); - pt.append(mPw, p); - spacer = " "; - } - mPw.print(") ("); - spacer = ""; - for (final Term p : x) { - mPw.print(spacer); - pt.append(mPw, p); - spacer = " "; - } - mPw.println("))"); - return super.findImpliedEquality(x, y); - } - - @Override - public QuotedObject echo(final QuotedObject msg) { - mPw.print("(echo "); - mPw.print(msg); - mPw.println(')'); - return super.echo(msg); - } - - /** - * Write a comment to the generated SMTLIB dump file. Note that this function is only available in the LoggingScript - * and not in the interface {@link Script} since it only makes sense for logging and not for solving. - * - * @param comment - * The comment to write to the dump file. - */ - public void comment(final String comment) { - mPw.print("; "); - mPw.println(comment); - } - - @Override - public void resetAssertions() { - mPw.println("(reset-assertions)"); - super.resetAssertions(); - } - - @Override - public Term[] getUnsatAssumptions() throws SMTLIBException, UnsupportedOperationException { - mPw.println("(get-unsat-assumptions)"); - return super.getUnsatAssumptions(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Logics.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Logics.java deleted file mode 100644 index 3686f27e8a2..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Logics.java +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * All logics configured in SMTLIB and some extensions supported by SMTInterpol. - * @author Juergen Christ - */ -public enum Logics { - CORE(0),// Pure Boolean logic - ALL (Features.QU + Features.NA + Features.IA + Features.RA + - Features.BV + Features.UF + Features.AX + Features.FP + Features.DT + Features.S), - HORN (Features.QU + Features.NA + Features.IA + Features.RA + - Features.BV + Features.UF + Features.AX + Features.FP + Features.DT + Features.S), - QF_ABV (Features.AX + Features.BV), - QF_ABVFP (Features.AX + Features.BV + Features.FP), - QF_ABVFPLRA (Features.AX + Features.BV + Features.FP + Features.LA + Features.RA), - QF_ALIA (Features.AX + Features.LA + Features.IA), - QF_ANIA (Features.AX + Features.NA + Features.IA), - QF_AUFBV (Features.AX + Features.UF + Features.BV), - QF_AUFBVFP (Features.AX + Features.UF + Features.BV + Features.FP), - QF_AUFBVFPLRA (Features.AX + Features.UF + Features.BV + Features.FP + Features.LA + Features.RA), - QF_AUFBVLIA (Features.AX + Features.UF + Features.BV + Features.LA + Features.IA), - QF_AUFBVNIA (Features.AX + Features.UF + Features.BV + Features.NA + Features.IA), - QF_AUFLIA (Features.AX + Features.UF + Features.LA + Features.IA), - QF_AUFLIRA (Features.AX + Features.UF + Features.LA + Features.IA + Features.RA), - QF_AUFNIA (Features.AX + Features.UF + Features.NA + Features.IA), - QF_AUFNIRA (Features.AX + Features.UF + Features.NA + Features.IA + Features.RA), - QF_AX (Features.AX), - QF_BV (Features.BV), - QF_BVFP (Features.BV + Features.FP), - QF_BVFPLRA (Features.BV + Features.FP + Features.LA + Features.RA), - QF_BVLRA (Features.BV + Features.LA + Features.RA), - QF_DT (Features.DT), - QF_FP (Features.FP), - QF_FPLRA (Features.FP + Features.LA + Features.RA), - QF_IDL (Features.DL + Features.IA), - QF_LIA (Features.LA + Features.IA), - QF_LIRA (Features.LA + Features.RA + Features.IA), - QF_LRA (Features.LA + Features.RA), - QF_NIA (Features.NA + Features.IA), - QF_NIRA (Features.NA + Features.RA + Features.IA), - QF_NRA (Features.NA + Features.RA), - QF_RDL (Features.DL + Features.RA), - QF_S (Features.S), - QF_SLIA (Features.S + Features.LA + Features.IA), - QF_SNIA (Features.S + Features.NA + Features.IA), - QF_UF (Features.UF), - QF_UFBV (Features.UF + Features.BV), - QF_UFBVDT (Features.UF + Features.BV + Features.DT), - QF_UFBVFP (Features.UF + Features.BV + Features.FP), - QF_UFBVLIA (Features.UF + Features.BV + Features.LA + Features.IA), - QF_UFDT (Features.UF + Features.DT), - QF_UFDTNIA (Features.UF + Features.DT + Features.NA + Features.IA), - QF_UFDTLIA (Features.UF + Features.DT + Features.LA + Features.IA), - QF_UFDTLIRA (Features.UF + Features.DT + Features.LA + Features.IA + Features.RA), - QF_UFFP (Features.UF + Features.FP), - QF_UFFPDTLIRA (Features.UF + Features.FP + Features.DT + Features.LA + Features.IA + Features.RA), - QF_UFFPDTNIRA (Features.UF + Features.FP + Features.DT + Features.NA + Features.IA + Features.RA), - QF_UFIDL (Features.UF + Features.DL + Features.IA), - QF_UFLIA (Features.UF + Features.LA + Features.IA), - QF_UFLIRA (Features.UF + Features.LA + Features.IA + Features.RA), - QF_UFLRA (Features.UF + Features.LA + Features.RA), - QF_UFNIA (Features.UF + Features.NA + Features.IA), - QF_UFNIRA (Features.UF + Features.NA + Features.IA + Features.RA), - QF_UFNRA (Features.UF + Features.NA + Features.RA), - - ABV (Features.QU + Features.AX + Features.BV), - ABVFP (Features.QU + Features.AX + Features.BV + Features.FP), - ABVFPLRA (Features.QU + Features.AX + Features.BV + Features.FP + Features.LA + Features.RA), - ALIA (Features.QU + Features.AX + Features.LA + Features.IA), - ANIA (Features.QU + Features.AX + Features.NA + Features.IA), - AUFBV (Features.QU + Features.AX + Features.UF + Features.BV), - AUFBVDTLIA (Features.QU + Features.AX + Features.UF + Features.BV + Features.DT + Features.LA + Features.IA), - AUFBVDTNIA (Features.QU + Features.AX + Features.UF + Features.BV + Features.DT + Features.NA + Features.IA), - AUFBVDTNIRA(Features.QU + Features.AX + Features.UF + Features.BV + Features.DT + Features.NA + Features.IA + Features.RA), - AUFBVFP (Features.QU + Features.AX + Features.UF + Features.BV + Features.FP), - AUFDTLIA (Features.QU + Features.AX + Features.UF + Features.DT + Features.LA + Features.IA), - AUFDTNIA (Features.QU + Features.AX + Features.UF + Features.DT + Features.NA + Features.IA), - AUFDTLIRA (Features.QU + Features.AX + Features.UF + Features.DT + Features.LA + Features.IA + Features.RA), - AUFDTNIRA (Features.QU + Features.AX + Features.UF + Features.DT + Features.NA + Features.IA + Features.RA), - AUFFPDTLIRA (Features.QU + Features.AX + Features.UF + Features.FP + Features.DT + Features.LA + Features.IA + Features.RA), - AUFFPDTNIRA (Features.QU + Features.AX + Features.UF + Features.FP + Features.DT + Features.NA + Features.IA + Features.RA), - AUFLIA (Features.QU + Features.AX + Features.UF + Features.LA + Features.IA), - AUFLIRA (Features.QU + Features.AX + Features.UF + Features.LA + Features.IA + Features.RA), - AUFNIA (Features.QU + Features.AX + Features.UF + Features.NA + Features.IA), - AUFNIRA (Features.QU + Features.AX + Features.UF + Features.NA + Features.IA + Features.RA), - BV (Features.QU + Features.BV), - BVFP (Features.QU + Features.BV + Features.FP), - BVFPLRA (Features.QU + Features.BV + Features.FP + Features.LA + Features.RA), - FP (Features.QU + Features.FP), - FPLRA (Features.QU + Features.FP + Features.LA + Features.RA), - LIA (Features.QU + Features.LA + Features.IA), - LRA (Features.QU + Features.LA + Features.RA), - NIA (Features.QU + Features.NA + Features.IA), - NRA (Features.QU + Features.NA + Features.RA), - UF (Features.QU + Features.UF), - UFBV (Features.QU + Features.UF + Features.BV), - UFBVDT (Features.QU + Features.UF + Features.BV + Features.DT), - UFBVFP (Features.QU + Features.UF + Features.BV + Features.FP), - UFBVLIA (Features.QU + Features.UF + Features.BV + Features.LA + Features.IA), - UFDT (Features.QU + Features.UF + Features.DT), - UFDTLIA (Features.QU + Features.DT + Features.UF + Features.LA + Features.IA), - UFDTLIRA (Features.QU + Features.DT + Features.UF + Features.LA + Features.IA + Features.RA), - UFDTNIA (Features.QU + Features.DT + Features.UF + Features.NA + Features.IA), - UFDTNIRA (Features.QU + Features.DT + Features.UF + Features.NA + Features.IA + Features.RA), - UFFPDTLIRA (Features.QU + Features.FP + Features.DT + Features.UF + Features.LA + Features.IA + Features.RA), - UFFPDTNIRA (Features.QU + Features.FP + Features.DT + Features.UF + Features.NA + Features.IA + Features.RA), - UFIDL (Features.QU + Features.UF + Features.DL + Features.IA), - UFLIA (Features.QU + Features.UF + Features.LA + Features.IA), - UFLRA (Features.QU + Features.UF + Features.LA + Features.RA), - UFNIA (Features.QU + Features.UF + Features.NA + Features.IA), - UFNIRA (Features.QU + Features.UF + Features.NA + Features.IA + Features.RA), - UFNRA (Features.QU + Features.UF + Features.NA + Features.RA), - - ; //NOCHECKSTYLE - - static class Features { - /** flag for quantified logic. */ - static final int QU = (1 << 0); - /** flag for uninterpreted functions. */ - static final int UF = (1 << 1); - /** flag for array theory. */ - static final int AX = (1 << 2); - /** flag for bit vector theory. */ - static final int BV = (1 << 3); - /** flag for difference logic. */ - static final int DL = (1 << 4); - /** flag for linear arithmetic. */ - static final int LA = (1 << 5); - /** flag for non-linear arithmetic. */ - static final int NA = (1 << 6); - /** flag for integer arithmetic. */ - static final int IA = (1 << 7); - /** flag for real arithmetic. */ - static final int RA = (1 << 8); - /** flag for floating point arithmetic. */ - static final int FP = (1 << 9); - /** flag for datatypes. */ - static final int DT = (1 << 10); - /** flag for string theory. */ - static final int S = (1 << 11); - } - - private final int mFeatures; - - private Logics(final int features) { - mFeatures = features; - } - - /** - * Is this logic mixed integer and real? - * @return true if and only if mixed arithmetic can be used in - * this logic. - */ - public boolean isIRA() { - return (mFeatures & (Features.IA + Features.RA)) - == (Features.IA + Features.RA); - } - /** - * Does this logic support uninterpreted functions and sorts? - * @return true if and only if the logic supports uninterpreted - * functions and sorts. - */ - public boolean isUF() { - return (mFeatures & Features.UF) != 0; - } - /** - * Does this logic support arrays? - * @return true if and only if this logic supports arrays. - */ - public boolean isArray() { - return (mFeatures & Features.AX) != 0; - } - /** - * Does this logic support bit vectors? - * @return true if and only if this logic supports bit vectors. - */ - public boolean isBitVector() { - return (mFeatures & Features.BV) != 0; - } - /** - * Does this logic support quantifiers? - * @return true if and only if quantified formulas can be build - * in this logic. - */ - public boolean isQuantified() { - return (mFeatures & Features.QU) != 0; - } - - /** - * Does this logic support arithmetic operators? - * @return true if and only if this logic supports arithmetic - */ - public boolean isArithmetic() { - return (mFeatures & (Features.NA + Features.LA + Features.DL)) != 0; - } - - /** - * Does this logic support difference logic? - * @return true if and only if this logic support difference - * logic; - * it returns false for linear arithmetic and non-linear arithmetic logics. - */ - public boolean isDifferenceLogic() { - return (mFeatures & Features.DL) != 0; - } - /** - * Is this logic restricted to linear arithmetic? - * @return true if and only if this logic is restricted to linear arithmetic. - */ - public boolean isLinearArithmetic() { - return (mFeatures & (Features.LA | Features.DL)) != 0; - } - /** - * Does this logic support non-linear arithmetic? - * @return true if and only if this logic support non-linear - * logic. - */ - public boolean isNonLinearArithmetic() { - return (mFeatures & Features.NA) != 0; - } - /** - * Does this logic have integers? - * @return true if and only if this logic has integers. - */ - public boolean hasIntegers() { - return (mFeatures & Features.IA) != 0; - } - /** - * Does this logic have real numbers? - * @return true if and only if this logic has reals. - */ - public boolean hasReals() { - return (mFeatures & Features.RA) != 0; - } - /** - * Does this logic support floating point arithmetic? - * @return true if and only if this logic supports floating - * point arithmetic. - */ - public boolean isFloatingPoint() { - return (mFeatures & Features.FP) != 0; - } - /** - * Does this logic support datatypes? - * @return true if and only if this logic supports datatypes. - */ - public boolean isDatatype() { - return (mFeatures & Features.DT) != 0; - } - /** - * Does this logic support strings? - * @return true if and only if this logic supports strings. - */ - public boolean isString() { - return (mFeatures & Features.S) != 0; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MatchTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MatchTerm.java deleted file mode 100644 index a89997a826b..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MatchTerm.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2018 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents a match term in SMTLIB 2. This class represents the - * SMTLIB 2 construct - * 
- * (match t (((c_1 v_11.. v1m) t_1) ... ((c_n v_n1.. vnm) t_m)))
- *
- * - * @author Jochen Hoenicke - */ -public class MatchTerm extends Term { - private final Term mDataTerm; - private final TermVariable[][] mVariables; - private final Term mCases[]; - private final DataType.Constructor[] mConstructors; - - MatchTerm(final int hash, final Term dataArg, final TermVariable[][] vars, final Term[] cases, - final DataType.Constructor[] constructors) { - super(hash); - mDataTerm = dataArg; - mVariables = vars; - mCases = cases; - mConstructors = constructors; - } - - @Override - public Sort getSort() { - return mCases[0].getSort(); - } - - public Term getDataTerm() { - return mDataTerm; - } - - public DataType.Constructor[] getConstructors() { - return mConstructors; - } - - public TermVariable[][] getVariables() { - return mVariables; - } - - public Term[] getCases() { - return mCases; - } - - public static final int hashMatch(final Term dataArg, final TermVariable[][] vars, final Term[] cases) { - return HashUtils.hashJenkins(dataArg.hashCode(), (Object[]) cases); - } - - @Override - public void toStringHelper(final ArrayDeque mTodo) { - // Add subterm to stack. - mTodo.addLast("))"); - for (int i = mCases.length - 1; i >= 0; i--) { - mTodo.addLast(")"); - mTodo.addLast(mCases[i]); - if (mConstructors[i] == null) { - mTodo.addLast(" "); - mTodo.addLast(mVariables[i][0]); - } else if (mVariables[i].length > 0) { - mTodo.addLast(") "); - for (int j = mVariables[i].length - 1; j >= 0; j--) { - mTodo.addLast(mVariables[i][j]); - mTodo.addLast(" "); - } - mTodo.addLast(mConstructors[i].getName()); - mTodo.addLast("("); - } else { - mTodo.addLast(" "); - mTodo.addLast(mConstructors[i].getName()); - } - mTodo.addLast(i > 0 ? " (" : "("); - } - mTodo.addLast(" ("); - mTodo.addLast(mDataTerm); - mTodo.addLast("(match "); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Model.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Model.java deleted file mode 100644 index 3c70328a22c..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Model.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.Map; -import java.util.Set; - -/** - * A minimal interface for model queries. The model should represent the model generated by an SMT solver. It should be - * detached from the solver, i.e., a model retrieved from a solver should not be invalidated by an assertion stack - * command. Note that the model is not a model of the assertion stack at that time, but we want to give the user the - * freedom to use the model in an interactive way. Note that symbols defined by model generation might be removed once - * the assertion stack level is popped off the stack. - * - * Values for numeric sorts in linear arithmetic logics are {@link ConstantTerm ConstantTerms} whose value is of type - * {@link Rational}. For non-numeric sorts, we return some term of the corresponding sort. No further guarantees are - * made. - * - * @author Juergen Christ, Jochen Hoenicke - */ -public interface Model { - /** - * Compute the value of an input term. - * - * @param input - * Term to evaluate. - * @return Value of the term. - */ - public Term evaluate(Term input); - - /** - * Compute the value of some input terms. - * - * @param input - * Terms to evaluate. - * @return Values of the terms. - */ - public Map evaluate(Term[] input); - - /** - * Get the set of function symbols for which the model defines the value. These is the set of uninterpreted function - * symbols. - * - * @return The set of function symbols. - */ - public Set getDefinedFunctions(); - - /** - * Get the definition of a function. This is a term that can be used as last parameter in a - * - * 
-	 * (define-fun ...)
-	 *
- * - * command. - * - * @param func - * the name of the function - * @param args - * the variables that should be used in the returned term to refer to the arguments. Their sort must - * match the function arguments of the function. - * @return The defining term. - */ - public Term getFunctionDefinition(String func, TermVariable[] args); -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MutableRational.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MutableRational.java deleted file mode 100644 index 20a1ac1d961..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/MutableRational.java +++ /dev/null @@ -1,532 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigInteger; - -import de.uni_freiburg.informatik.ultimate.logic.Rational.BigRational; - -/** - * Mutable version of the {@link Rational} class. All arithmetic - * operations change the value of this object. - * - * This class is intended to save some unneeded temporary objects in bigger - * calculations. This should reduce the number of garbage collections such that - * the program should run faster. - * - * @author Juergen Christ - */ -public class MutableRational implements Comparable { - int mNum; - int mDenom; - BigInteger mBignum; - BigInteger mBigdenom; - - /** - * Create a new rational representing num/denom. - * @param num the numerator. - * @param denom the denominator. - */ - public MutableRational(int num, int denom) { - setValue(num, denom); - } - - /** - * Create a new rational representing num/denom. - * @param num the numerator. - * @param denom the denominator. - */ - public MutableRational(BigInteger num, BigInteger denom) { - mBignum = num; - mBigdenom = denom; - normalize(); - } - - /** - * Create a new mutable rational from a rational. - * @param r the rational. - */ - public MutableRational(Rational r) { - mNum = r.mNum; - mDenom = r.mDenom; - if (r instanceof Rational.BigRational) { - mBignum = r.numerator(); - mBigdenom = r.denominator(); - } - } - - /** - * Create a new copy of a mutable rational. - * @param r the original rational. - */ - public MutableRational(MutableRational r) { - mNum = r.mNum; - mDenom = r.mDenom; - mBignum = r.mBignum; - mBigdenom = r.mBigdenom; - } - - /** - * Set the value of this rational to value. - * @param value the value to set to. - */ - public void setValue(Rational value) { - mNum = value.mNum; - mDenom = value.mDenom; - if (value instanceof Rational.BigRational) { - mBignum = value.numerator(); - mBigdenom = value.denominator(); - } else { - mBignum = mBigdenom = null; - } - } - - /** - * Set the value of this rational to newnum/newdenom. - * @param newnum the new numerator. - * @param newdenom the new denominator. - */ - public void setValue(long newnum, long newdenom) { - long gcd2 = Rational.gcd(Math.abs(newnum), Math.abs(newdenom)); - if (newdenom < 0) { - gcd2 = -gcd2; - } - if (gcd2 != 0) { - newnum /= gcd2; - newdenom /= gcd2; - } - - if (Integer.MIN_VALUE <= newnum && newnum <= Integer.MAX_VALUE - && newdenom <= Integer.MAX_VALUE) { - mNum = (int) newnum; - mDenom = (int) newdenom; - mBignum = mBigdenom = null; - } else { - mBignum = BigInteger.valueOf(newnum); - mBigdenom = BigInteger.valueOf(newdenom); - } - } - - /** - * Normalize the rational by dividing through the gcd. This is - * called after every operation. - */ - private void normalize() { - if (mBignum == null) { - final int norm = Rational.gcd(mNum, mDenom); - if (norm != 0 && norm != 1) { - mNum /= norm; - mDenom /= norm; - } - if (mDenom < 0) { - mNum = -mNum; - mDenom = -mDenom; - } - } else { - if (!mBigdenom.equals(BigInteger.ONE)) { - BigInteger norm = Rational.gcd(mBignum, mBigdenom).abs(); - if (mBigdenom.signum() < 0) { - norm = norm.negate(); - } - if (!norm.equals(BigInteger.ZERO) - && !norm.equals(BigInteger.ONE)) { - mBignum = mBignum.divide(norm); - mBigdenom = mBigdenom.divide(norm); - } - } - if (mBigdenom.bitLength() < 32 && mBignum.bitLength() < 32) { // NOCHECKSTYLE - mNum = mBignum.intValue(); - mDenom = mBigdenom.intValue(); - mBignum = mBigdenom = null; - } - } - } - - /** - * Add the rational other to this rational. - * @param other the rational to add. - * @return this mutable rational. - */ - public MutableRational add(Rational other) { - /* fast path */ - if (other == Rational.ZERO) { - return this; - } - if (mBignum == null && !(other instanceof Rational.BigRational)) { - if (mDenom == other.mDenom) { - /* handle gcd = 0 correctly - * two INFINITYs with same sign give INFINITY, - * otherwise it gives NAN. - */ - if (mDenom == 0) { - if (mNum != other.mNum) { - mNum = 0; - } - } else { - /* a common, very simple case, e.g. for integers */ - setValue((long) mNum + other.mNum, mDenom); - } - } else { - final int gcd = Rational.gcd(mDenom, other.mDenom); - final long denomgcd = mDenom / gcd; - final long otherdenomgcd = other.mDenom / gcd; - final long newdenom = denomgcd * other.mDenom; - final long newnum = otherdenomgcd * mNum + denomgcd * other.mNum; - setValue(newnum, newdenom); - } - return this; - } - - if (mBignum == null && mNum == 0 && mDenom == 1) { - /* This is zero; set result to other */ - mBignum = other.numerator(); - mBigdenom = other.denominator(); - return this; - } - - final BigInteger tdenom = denominator(); - final BigInteger odenom = other.denominator(); - if (tdenom.equals(odenom)) { - mBignum = numerator().add(other.numerator()); - mBigdenom = tdenom; - } else { - final BigInteger gcd = Rational.gcd(tdenom, odenom); - final BigInteger tdenomgcd = tdenom.divide(gcd); - final BigInteger odenomgcd = odenom.divide(gcd); - mBignum = numerator().multiply(odenomgcd) - .add(other.numerator().multiply(tdenomgcd)); - mBigdenom = tdenom.multiply(odenomgcd); - } - normalize(); - return this; - } - - /** - * Negate this rational, i.e., this = -this. - * @return this mutable rational. - */ - public MutableRational negate() { - if (mBignum == null) { - if (mNum == Integer.MIN_VALUE) { - setValue(-(long)Integer.MIN_VALUE, mDenom); - } else { - mNum = -mNum; - } - } else { - mBignum = mBignum.negate(); - } - return this; - } - - /** - * Subtract the other rational from this. - * @param other the rational to subtract. - * @return this mutable rational. - */ - public MutableRational sub(Rational other) { - return add(other.negate()); - } - - /** - * Multiply this rational with other and store the result in this. - * @param other the rational to multiply with. - * @return this mutable rational. - */ - public MutableRational mul(Rational other) { - /* fast path */ - if (other == Rational.ONE) { - return this; - } - if (other == Rational.MONE) { - return negate(); - } - if (mBignum == null && !(other instanceof Rational.BigRational)) { - final long newnum = (long)mNum * other.mNum; - final long newdenom = (long)mDenom * other.mDenom; - setValue(newnum, newdenom); - return this; - } - - mBignum = numerator().multiply(other.numerator()); - mBigdenom = denominator().multiply(other.denominator()); - normalize(); - return this; - } - - /** - * Divide this rational by the other and store the result in this. - * @param other the divisor. - * @return this mutable rational. - */ - public MutableRational div(Rational other) { - /* fast path */ - if (other == Rational.ZERO) { - throw new ArithmeticException("Division by ZERO"); - } - if (mBignum == null && mNum == 0) { - return this; - } - if (other == Rational.ONE) { - return this; - } - if (other == Rational.MONE) { - return negate(); - } - if (mBignum == null && !(other instanceof Rational.BigRational)) { - long newnum = (long)mNum * other.mDenom; - final long newdenom = (long)mDenom * other.mNum; - // +-inf : -c = -+inf - if (newdenom == 0 && other.mNum < 0) { - newnum = -newnum; - } - setValue(newnum, newdenom); - return this; - } - mBignum = numerator().multiply(other.denominator()); - mBigdenom = denominator().multiply(other.numerator()); - // +-inf : -c = -+inf - if (mBigdenom.equals(BigInteger.ZERO) - && other.numerator().signum() == -1) { - mBignum = mBignum.negate(); - } - normalize(); - return this; - } - - /** - * Compute the multiplicative inverse of this rational and store - * it in this. - * @return this mutable rational. - */ - public MutableRational inverse() { - if (mBignum == null) { - setValue(mDenom, mNum); - } else { - final BigInteger tmp = mBigdenom; - if (mBignum.signum() < 0) { - mBigdenom = mBignum.negate(); - mBignum = tmp.negate(); - } else { - mBigdenom = mBignum; - mBignum = tmp; - } - } - return this; - } - - /** - * Check if this rational is negative. - * @return true iff {@code this < 0}. - */ - public boolean isNegative() { - return numerator().signum() < 0; - } - - /** - * Computes {@code this += (fac1*fac2)}. - * @param fac1 one of the factors. - * @param fac2 the other factor. - * @return this mutable rational. - */ - public MutableRational addmul(Rational fac1,Rational fac2) { - return add(fac1.mul(fac2)); - } - - /** - * Computes {@code this += (fac1*fac2)}. - * @param fac1 one of the factors. - * @param fac2 the other factor. - * @return this mutable rational. - */ - public MutableRational addmul(Rational fac1,BigInteger fac2) { - return add(fac1.mul(fac2)); - } - - /** - * Computes {@code this = (this - s) / d}. - * @param s the rational to subtract. - * @param d the divisor. - * @return this mutable rational. - */ - public MutableRational subdiv(Rational s,Rational d) { - return sub(s).div(d); - } - - @Override - /** - * Compares this mutable rational with the other. - * @param o the other mutable rational. - * @return -1, if this < o; 1, if this > o; 0 if they are equal. - */ - public int compareTo(MutableRational o) { - /* fast path */ - if (mBignum == null && o.mBignum == null) { - /* handle infinities and nan */ - if (o.mDenom == mDenom) { - return mNum < o.mNum ? -1 : mNum == o.mNum ? 0 : 1; - } - final long valt = (long)mNum * o.mDenom; - final long valo = (long)o.mNum * mDenom; - return valt < valo ? -1 : valt == valo ? 0 : 1; - } - final BigInteger valthis = numerator().multiply(o.denominator()); - final BigInteger valo = o.numerator().multiply(denominator()); - return valthis.compareTo(valo); - } - - /** - * Compares this mutable rational with the other. - * @param o the other rational. - * @return -1, if this < o; 1, if this > o; 0 if they are equal. - */ - public int compareTo(Rational o) { - /* fast path */ - if (mBignum == null && !(o instanceof BigRational)) { - /* handle infinities and nan */ - if (o.mDenom == mDenom) { - return mNum < o.mNum ? -1 : mNum == o.mNum ? 0 : 1; - } - final long valt = (long)mNum * o.mDenom; - final long valo = (long)o.mNum * mDenom; - return valt < valo ? -1 : valt == valo ? 0 : 1; - } - final BigInteger valthis = numerator().multiply(o.denominator()); - final BigInteger valo = o.numerator().multiply(denominator()); - return valthis.compareTo(valo); - } - - /** - * Compares this mutable rational with the other. This works with - * MutableRational and Rational. - * @param o the other rational. - * @return true if this equals o, false otherwise. - */ - @Override - public boolean equals(Object o) { - if (o instanceof Rational) { - final Rational r = (Rational) o; - // Works thanks to normalization!!! - return mBignum == null - ? !(r instanceof Rational.BigRational) - && mNum == r.mNum && mDenom == r.mDenom - : mBignum.equals(r.numerator()) - && mBigdenom.equals(r.denominator()); - } - if (o instanceof MutableRational) { - final MutableRational r = (MutableRational) o; - // Works thanks to normalization!!! - return mBignum == null - ? r.mBignum == null && mNum == r.mNum && mDenom == r.mDenom - : mBignum.equals(r.mBignum) && mBigdenom.equals(r.mBigdenom); - } - return false; - } - - /** - * Get the numerator of this rational. - * @return the numerator. - */ - public BigInteger numerator() { - return mBignum == null ? BigInteger.valueOf(mNum) : mBignum; - } - - /** - * Get the denominator of this rational. - * @return the denominator. - */ - public BigInteger denominator() { - return mBigdenom == null ? BigInteger.valueOf(mDenom) : mBigdenom; - } - - /** - * Computes a hashcode. The hashcode is computed as - * {@code 257 * numerator + denominator} if both fit into an integer and - * {@code 257 * numerator().hashCode() + denominator().hashCode()} if big - * integers are necessary. - * @return the hashcode. - */ - @Override - public int hashCode() { - if (mBignum == null) { - return mNum * 257 + mDenom; - } else { - return mBignum.hashCode() * 257 + mBigdenom.hashCode(); - } - } - - /** - * Get a string representation of this number. This is - * {@code numerator()+ "/" + denominator()} except for - * infinity ({@code "inf"}), nan ({@code "nan"}), or minus - * infinity ({@code "-inf"}). - * @return the string representation. - */ - @Override - public String toString() { - /* fast path */ - if (mBignum == null) { - if (mDenom == 0) { - return mNum > 0 ? "inf" : mNum == 0 ? "nan" : "-inf"; - } - if (mDenom == 1) { - return String.valueOf(mNum); - } - return mNum + "/" + mDenom; - } else { - if (mBigdenom.equals(BigInteger.ONE)) { - return mBignum.toString(); - } - return mBignum + "/" + mBigdenom; - } - } - - /** - * Check whether this rational represents an integral value. Both infinity - * values are treated as integral. - * @return {@code true} iff value is integral. - */ - public boolean isIntegral() { - return (mBignum == null) - ? mDenom <= 1 : mBigdenom.equals(BigInteger.ONE); - } - - /** - * Convert this mutable rational into a immutable rational. - * @return the rational. - */ - public Rational toRational() { - if (mBignum == null) { - return Rational.valueOf(mNum, mDenom); - } - return Rational.valueOf(numerator(), denominator()); - } - - /** - * Compute sign of this rational. This is equivalent to - * {@code compare(Rational.ZERO)}. - * @return the sign of the rational, +1 for positive, 0 for 0 and - * -1 for negative. - */ - public int signum() { - if (mBignum == null) { - return mNum < 0 ? -1 : mNum == 0 ? 0 : 1; - } - return mBignum.signum(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NonRecursive.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NonRecursive.java deleted file mode 100644 index 22e4ad263fc..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NonRecursive.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; - -/** - * This class does a recursive algorithm by using an explicit stack on - * the heap. - * - * If you need a stateless walker, you can just implement Walker. If - * your goal is to walk terms, then TermWalker may help you, as it already - * dispatches the walk function based on the type of the term. A simple - * term walker can be created as: - * - * 
- * class MyWalker extends TermWalker {
- *    MyWalker(Term term) { super(term) }
- *    walk(NonRecursiveWalker walker, final ApplicationTerm appTerm) {
- *       walker.addWorkItem(new NonRecursive.Walker() {
- *          public void walk(NonRecursiveWalker walker) {
- *             // ... code that should run after parameters are processed
- *          }
- *       }
- *       for (Term param : appTerm.getParameters()) {
- *          walker.enqueueWalker(new MyWalker(param));
- *       }
- *    }
- *    walk(... // handle other term classes...
- *
- * - * For stateful walker you need to extend the class NonRecursive. In - * addition you still need a Walker class that does the job. It can - * access the state by casting NonRecursive. - * - * Results can be added in a stateful walker to an additional result - * stack. See FormulaUnLet as an example. - * - * @see ComputeFreeVariables - * @see FormulaUnLet - * @author Jochen Hoenicke - */ -public class NonRecursive { - /** - * The todo stack. It contains the terms to convert and some info how much - * was already processed of this term. - */ - private final ArrayDeque mTodo = new ArrayDeque<>(); - - /** - * Walker that does some piece of work. This can be added to - * the todo stack to be executed later. - * - * @author hoenicke - */ - protected interface Walker { - /** - * Do one step of the recursive algorithm. This may enqueue new - * walkers that do the remaining steps. - * @param engine The non recursive engine where new walkers - * can be enqueued. - */ - public void walk(NonRecursive engine); - } - /** - * Manually reset this walker. This function can be used to clear the - * todo stack when an exception is raised by a walker. This exception will - * terminate the non-recursive walk but will leave some walker in the todo - * stack. - */ - protected void reset() { - mTodo.clear(); - } - - /** - * Enqueues a walker on the todo stack. - * @param item the walker to enqueue. - */ - public void enqueueWalker(final Walker item) { - mTodo.addLast(item); - } - - /** - * The main work horse. This will repeat doing work items until the - * todo stack is empty. - * @param item the walker to execute initially. - */ - public void run(final Walker item) { - mTodo.addLast(item); - run(); - } - /** - * The main work horse. This will repeat doing work items until the - * todo stack is empty. This method expects that some Walker are on - * the todo stack. - */ - public void run() { - while (!mTodo.isEmpty()) { - mTodo.removeLast().walk(this); - } - } - - @Override - public String toString() { - return mTodo.toString(); - } - - /** - * Walker that walks non-recursively over terms. - * This dispatches the walk function. You still have to provide - * the code that chooses which sub terms to walk. - * - * @author hoenicke - */ - public static abstract class TermWalker implements Walker { - protected Term mTerm; - public TermWalker(final Term term) { - mTerm = term; - } - @Override - public void walk(final NonRecursive walker) { - if (mTerm instanceof ApplicationTerm) { - walk(walker, (ApplicationTerm) mTerm); - } else if (mTerm instanceof LetTerm) { - walk(walker, (LetTerm) mTerm); - } else if (mTerm instanceof AnnotatedTerm) { - walk(walker, (AnnotatedTerm) mTerm); - } else if (mTerm instanceof LambdaTerm) { - walk(walker, (LambdaTerm) mTerm); - } else if (mTerm instanceof QuantifiedFormula) { - walk(walker, (QuantifiedFormula) mTerm); - } else if (mTerm instanceof ConstantTerm) { - walk(walker, (ConstantTerm) mTerm); - } else if (mTerm instanceof TermVariable) { - walk(walker, (TermVariable) mTerm); - } else if (mTerm instanceof MatchTerm) { - walk(walker, (MatchTerm) mTerm); - } - } - - public abstract void walk(NonRecursive walker, ConstantTerm term); - public abstract void walk(NonRecursive walker, AnnotatedTerm term); - public abstract void walk(NonRecursive walker, ApplicationTerm term); - public abstract void walk(NonRecursive walker, LetTerm term); - public abstract void walk(NonRecursive walker, LambdaTerm term); - public abstract void walk(NonRecursive walker, QuantifiedFormula term); - public abstract void walk(NonRecursive walker, TermVariable term); - public abstract void walk(NonRecursive walker, MatchTerm term); - - public Term getTerm() { - return mTerm; - } - - @Override - public String toString() { - return getClass().getSimpleName() + ":" + mTerm; - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NoopScript.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NoopScript.java deleted file mode 100644 index 8fc635b8476..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/NoopScript.java +++ /dev/null @@ -1,617 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Map; - -import de.uni_freiburg.informatik.ultimate.logic.DataType.Constructor; -import de.uni_freiburg.informatik.ultimate.logic.Theory.SolverSetup; - -/** - * Simple implementation of a script, that supports building terms and sorts, - * but does not support setting and getting options, checking for satisfiabilty, - * or getting any other results. - * - * This can be used as base class for implementing the script interface. - * - * @author Jürgen Christ, Jochen Hoenicke - */ -public class NoopScript implements Script { - - private Theory mTheory; - protected int mStackLevel = 0; - - protected SolverSetup mSolverSetup; - - public NoopScript() { - this(null, null); - } - - protected NoopScript(final Theory theory) { - this(theory, null); - } - - protected NoopScript(final Theory theory, final SolverSetup setup) { - mTheory = theory; - mSolverSetup = setup; - } - - @Override - public Theory getTheory() { - return mTheory; - } - - /** - * Check that the symbol does not contain characters that would make - * it impossible to use it in a LoggingScript. These are | and \. - * @param symbol the symbol to check - * @throws SMTLibException if symbol contains | or \. - */ - private void checkSymbol(final String symbol) throws SMTLIBException { - if (symbol.indexOf('|') >= 0 || symbol.indexOf('\\') >= 0) { - throw new SMTLIBException("Symbol must not contain | or \\"); - } - } - - @Override - public void setLogic(final String logic) throws UnsupportedOperationException { - try { - setLogic(Logics.valueOf(logic)); - } catch (final IllegalArgumentException eLogicUnsupported) { - /* Logic is not in enumeration */ - throw new UnsupportedOperationException("Logic " + logic - + " not supported"); - } - } - - @Override - public void setLogic(final Logics logic) throws UnsupportedOperationException { - if (mTheory != null) { - throw new SMTLIBException("Logic already set!"); - } - mTheory = new Theory(logic, mSolverSetup); - } - - @Override - public void setOption(final String opt, final Object value) - throws UnsupportedOperationException, SMTLIBException { - // Nothing to do - } - - @Override - public void setInfo(final String info, final Object value) { - // Nothing to do - } - - @Override - public FunctionSymbol getFunctionSymbol(final String constructor) { - return mTheory.getFunctionSymbol(constructor); - } - - @Override - public DataType.Constructor constructor(final String name, final String[] selectors, final Sort[] argumentSorts) { - if (name == null) { - throw new SMTLIBException( - "Invalid input to declare a datatype"); - } - checkSymbol(name); - return mTheory.createConstructor(name, selectors, argumentSorts); - } - - @Override - public DataType datatype(final String typename, final int numParams) { - if (typename == null) { - throw new SMTLIBException( - "Invalid input to declare a datatype"); - } - checkSymbol(typename); - return mTheory.createDatatypes(typename, numParams); - } - - /** - * Declare internal functions for the constructors and selectors of the datatype. - * @param datatype The datatype. - * @param constrs The constructors. - * @throws SMTLIBException - */ - private void declareConstructorFunctions(final DataType datatype, final DataType.Constructor[] constrs, final Sort[] sortParams) { - final String[] indices = null; - Sort datatypeSort; - if (sortParams == null) { - if (datatype.mNumParams != 0) { - throw new SMTLIBException("Sort parameters missing"); - } - datatypeSort = datatype.getSort(indices, Theory.EMPTY_SORT_ARRAY); - } else { - if (datatype.mNumParams == 0 || datatype.mNumParams != sortParams.length) { - throw new SMTLIBException("Sort parameter mismatch"); - } - datatypeSort = datatype.getSort(indices, sortParams); - } - final Sort[] selectorParamSorts = new Sort[] { datatypeSort }; - - for (final Constructor cons : constrs) { - - final String constrName = cons.getName(); - final String[] selectors = cons.getSelectors(); - final Sort[] argumentSorts = cons.getArgumentSorts(); - - if (sortParams == null) { - getTheory().declareInternalFunction(constrName, argumentSorts, datatypeSort, FunctionSymbol.CONSTRUCTOR); - - for (int j = 0; j < selectors.length; j++) { - getTheory().declareInternalFunction(selectors[j], selectorParamSorts, argumentSorts[j], FunctionSymbol.SELECTOR); - } - } else { - final int constrFlags = FunctionSymbol.CONSTRUCTOR - + (cons.needsReturnOverload() ? FunctionSymbol.RETURNOVERLOAD : 0); - getTheory().declareInternalPolymorphicFunction(constrName, sortParams, argumentSorts, - datatypeSort, constrFlags); - - for (int j = 0; j < selectors.length; j++) { - getTheory().declareInternalPolymorphicFunction(selectors[j], sortParams, selectorParamSorts, - argumentSorts[j], FunctionSymbol.SELECTOR); - } - } - } - } - - @Override - public void declareDatatype(final DataType datatype, final DataType.Constructor[] constrs) { - assert datatype.mNumParams == 0; - datatype.setConstructors(new Sort[0], constrs); - declareConstructorFunctions(datatype, constrs, null); - } - - @Override - public void declareDatatypes(final DataType[] datatypes, final DataType.Constructor[][] constrs, final Sort[][] sortParams) { - for (int i = 0; i < datatypes.length; i++) { - datatypes[i].setConstructors(sortParams[i], constrs[i]); - declareConstructorFunctions(datatypes[i], constrs[i], sortParams[i]); - } - } - - @Override - public void declareSort(final String sort, final int arity) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - checkSymbol(sort); - try { - mTheory.declareSort(sort, arity); - } catch (final IllegalArgumentException eiae) { - throw new SMTLIBException(eiae.getMessage()); - } - } - - @Override - public void defineSort(final String sort, final Sort[] sortParams, final Sort definition) - throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - checkSymbol(sort); - try { - mTheory.defineSort(sort, sortParams.length, definition); - } catch (final IllegalArgumentException eiae) { - throw new SMTLIBException(eiae.getMessage()); - } - } - - @Override - public void declareFun(final String fun, final Sort[] paramSorts, final Sort resultSort) - throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - checkSymbol(fun); - try { - mTheory.declareFunction(fun, paramSorts, resultSort); - } catch (final IllegalArgumentException eiae) { - throw new SMTLIBException(eiae.getMessage()); - } - } - - @Override - public void defineFun(final String fun, final TermVariable[] params, - final Sort resultSort, final Term definition) throws SMTLIBException { - checkSymbol(fun); - defineFunInternal(fun, params, resultSort, definition); - } - - private void defineFunInternal(final String fun, final TermVariable[] params, - final Sort resultSort, final Term definition) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (!resultSort.equalsSort(definition.getSort())) { - throw new SMTLIBException("Sort mismatch"); - } - try { - mTheory.defineFunction(fun, params, definition); - } catch (final IllegalArgumentException eiae) { - throw new SMTLIBException(eiae.getMessage()); - } - } - - @Override - public void push(final int levels) { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - mStackLevel += levels; - for (int i = 0; i < levels; i++) { - mTheory.push(); - } - } - - @Override - public void pop(final int levels) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (levels > mStackLevel) { - throw new SMTLIBException("Not enough levels on assertion stack"); - } - mStackLevel -= levels; - for (int i = 0; i < levels; i++) { - mTheory.pop(); - } - } - - @Override - public LBool assertTerm(final Term term) throws SMTLIBException { - return LBool.UNKNOWN; - } - - @Override - public LBool checkSat() { - return LBool.UNKNOWN; - } - - @Override - public LBool checkSatAssuming(final Term... assumptions) { - return LBool.UNKNOWN; - } - - @Override - public Term[] getAssertions() throws SMTLIBException { - throw new UnsupportedOperationException(); - } - - @Override - public Term getProof() throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Term[] getUnsatCore() throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Map getValue(final Term[] terms) throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Assignments getAssignment() throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Object getOption(final String opt) - throws UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Object getInfo(final String info) - throws UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Term simplify(final Term term) throws SMTLIBException { - throw new UnsupportedOperationException(); - } - - @Override - public void reset() { - mTheory = null; - mStackLevel = 0; - } - - @Override - public Term[] getInterpolants(final Term[] partition) throws SMTLIBException, - UnsupportedOperationException { - // The default startOfSubtrees is an array with 0's. - final int[] startOfSubtrees = new int[partition.length]; - return getInterpolants(partition, startOfSubtrees); - } - - @Override - public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree) - throws SMTLIBException, UnsupportedOperationException { - return getInterpolants(partition, startOfSubtree, getProof()); - } - - @Override - public Term[] getInterpolants(final Term[] partition, final int[] startOfSubtree, final Term proofTree) - throws SMTLIBException, UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public void exit() { - // Nothing to do - } - - @Override - public Sort sort(final String sortname, final Sort... params) throws SMTLIBException { - return sort(sortname, null, params); - } - - @Override - public Sort sort(final String sortname, final String[] indices, final Sort... params) - throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - final Sort res = mTheory.getSort(sortname, indices, params); - if (res == null) { - throw new SMTLIBException("Sort " + sortname + " not declared"); - } - return res; - } - - @Override - public Term term(final String funcname, final Term... params) throws SMTLIBException { - return term(funcname, null, null, params); - } - - @Override - public Term term(final String funcname, final String[] indices, - final Sort returnSort, final Term... params) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - return mTheory.term(funcname, indices, returnSort, params); - } - - @Override - public TermVariable variable(final String varname, final Sort sort) - throws SMTLIBException { - if (sort == null || varname == null) { - throw new SMTLIBException( - "Invalid input to create a term variable"); - } - checkSymbol(varname); - return mTheory.createTermVariable(varname, sort); - } - - @Override - public Term quantifier(final int quantor, final TermVariable[] vars, Term body, - final Term[]... patterns) throws SMTLIBException { - if (vars.length == 0) { - throw new SMTLIBException("No quantified variables given"); - } - if (body == null) { - throw new SMTLIBException("Empty quantifier body"); - } - if (patterns != null && patterns.length > 0) { - final Annotation[] annots = new Annotation[patterns.length]; - int i = 0; - for (final Term[] p : patterns) { - annots[i++] = new Annotation(":pattern", p); - } - body = mTheory.annotatedTerm(annots, body); - } - if (quantor == Script.EXISTS) { - return mTheory.exists(vars, body); - } - if (quantor == Script.FORALL) { - return mTheory.forall(vars, body); - } - throw new SMTLIBException("Unknown Quantifier"); - } - - @Override - public Term let(final TermVariable[] vars, final Term[] values, final Term body) - throws SMTLIBException { - if (vars.length != values.length) { - throw new SMTLIBException( - "Need exactly one value for every variable"); - } - return mTheory.let(vars, values, body); - } - - @Override - public Term match(final Term dataArg, final TermVariable[][] vars, final Term[] cases, - final DataType.Constructor[] constructors) throws SMTLIBException { - return mTheory.match(dataArg, vars, cases, constructors); - } - - - - @Override - public Term annotate(final Term t, final Annotation... annotations) - throws SMTLIBException { - if (annotations.length > 0) { - for (final Annotation a : annotations) { - if (a.getKey().equals(":named")) { - if (!(a.getValue() instanceof String)) { - throw new SMTLIBException( - "Need a string value for :named"); - } - checkSymbol((String) a.getValue()); - if (t.getFreeVars().length != 0) { - throw new SMTLIBException("Cannot name open terms"); - } else { - defineFunInternal((String) a.getValue(), - Theory.EMPTY_TERM_VARIABLE_ARRAY, t.getSort(), t); - } - } - } - return mTheory.annotatedTerm(annotations, t); - } else { - return t; - } - } - - @Override - public Term numeral(final String num) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (mTheory.getNumericSort() == null) { - throw new SMTLIBException("Logic does not allow numerals"); - } - try { - return mTheory.numeral(num); - } catch (final NumberFormatException enfe) { - throw new SMTLIBException("Not a numeral: " + num); - } - } - - @Override - public Term numeral(final BigInteger num) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (mTheory.getNumericSort() == null) { - throw new SMTLIBException("Logic does not allow numerals"); - } - return mTheory.numeral(num); - } - - @Override - public Term decimal(final String decimal) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (mTheory.getRealSort() == null) { - throw new SMTLIBException("Logic does not allow reals"); - } - try { - return mTheory.decimal(decimal); - } catch (final NumberFormatException enfe) { - throw new SMTLIBException("Not a decimal: " + decimal); - } - } - - @Override - public Term decimal(final BigDecimal decimal) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (mTheory.getRealSort() == null) { - throw new SMTLIBException("Logic does not allow reals"); - } - return mTheory.decimal(decimal); - } - - @Override - public Term string(final QuotedObject str) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - if (mTheory.getStringSort() == null) { - throw new SMTLIBException("Logic does not allow strings"); - } - return mTheory.string(str); - } - - @Override - public Term hexadecimal(final String hex) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - final Term res = mTheory.hexadecimal(hex); - if (res == null) { - throw new SMTLIBException("No bitvector logic"); - } - return res; - } - - @Override - public Term binary(final String bin) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - final Term res = mTheory.binary(bin); - if (res == null) { - throw new SMTLIBException("No bitvector logic"); - } - return res; - } - - @Override - public Sort[] sortVariables(final String... names) throws SMTLIBException { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - return mTheory.createSortVariables(names); - } - - @Override - public Model getModel() throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Iterable checkAllsat(final Term[] predicates) - throws SMTLIBException, UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public Term[] findImpliedEquality(final Term[] x, final Term[] y) - throws SMTLIBException, UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public QuotedObject echo(final QuotedObject msg) { - return msg; - } - - @Override - public void resetAssertions() { - if (mTheory == null) { - throw new SMTLIBException("No logic set!"); - } - mTheory.resetAssertions(); - mStackLevel = 0; - } - - @Override - public Term[] getUnsatAssumptions() throws SMTLIBException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/OccurrenceCounter.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/OccurrenceCounter.java deleted file mode 100644 index 449d80150d5..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/OccurrenceCounter.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (C) 2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -public class OccurrenceCounter extends NonRecursive { - - private static class CountWalker extends TermWalker { - - public CountWalker(final Term term) { - super(term); - } - - @Override - public void walk(final NonRecursive walker, final ConstantTerm term) { - // TODO Do we need counts for constants??? - } - - @Override - public void walk(final NonRecursive walker, final AnnotatedTerm term) { - // just skip - walker.enqueueWalker(new CountWalker(term.getSubterm())); - } - - @Override - public void walk(final NonRecursive walker, final ApplicationTerm term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (++term.mTmpCtr == 1) { - for (final Term t : term.getParameters()) { - occ.enqueueWalker(new CountWalker(t)); - } - } - } - - @Override - public void walk(final NonRecursive walker, final LetTerm term) { - throw new InternalError("Term should be unletted before counting"); - } - - @Override - public void walk(final NonRecursive walker, final QuantifiedFormula term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (++term.mTmpCtr == 1) { - occ.enqueueWalker(new CountWalker(term.getSubformula())); - } - } - - @Override - public void walk(final NonRecursive walker, final LambdaTerm term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (++term.mTmpCtr == 1) { - occ.enqueueWalker(new CountWalker(term.getSubterm())); - } - } - - @Override - public void walk(final NonRecursive walker, final TermVariable term) { - ++term.mTmpCtr; - } - - @Override - public void walk(final NonRecursive walker, final MatchTerm term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (++term.mTmpCtr == 1) { - occ.enqueueWalker(new CountWalker(term.getDataTerm())); - for (final Term t : term.getCases()) { - occ.enqueueWalker(new CountWalker(t)); - } - } - } - } - - private static class ResetWalker extends TermWalker { - - public ResetWalker(final Term term) { - super(term); - } - - @Override - public void walk(final NonRecursive walker, final ConstantTerm term) { - // TODO Do we need counts for constants??? - } - - @Override - public void walk(final NonRecursive walker, final AnnotatedTerm term) { - // just skip - walker.enqueueWalker(new ResetWalker(term.getSubterm())); - } - - @Override - public void walk(final NonRecursive walker, final ApplicationTerm term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (term.mTmpCtr != 0) { - for (final Term t : term.getParameters()) { - occ.enqueueWalker(new ResetWalker(t)); - } - term.mTmpCtr = 0; - } - } - - @Override - public void walk(final NonRecursive walker, final LetTerm term) { - throw new InternalError("Term should be unletted before counting"); - } - - @Override - public void walk(final NonRecursive walker, final LambdaTerm term) { - // TODO Do we really want to descent into quantified formulas??? - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (term.mTmpCtr != 0) { - occ.enqueueWalker(new ResetWalker(term.getSubterm())); - term.mTmpCtr = 0; - } - } - - @Override - public void walk(final NonRecursive walker, final QuantifiedFormula term) { - // TODO Do we really want to descent into quantified formulas??? - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (term.mTmpCtr != 0) { - occ.enqueueWalker(new ResetWalker(term.getSubformula())); - term.mTmpCtr = 0; - } - } - - @Override - public void walk(final NonRecursive walker, final TermVariable term) { - term.mTmpCtr = 0; - } - - @Override - public void walk(final NonRecursive walker, final MatchTerm term) { - final OccurrenceCounter occ = (OccurrenceCounter) walker; - if (term.mTmpCtr != 0) { - occ.enqueueWalker(new ResetWalker(term.getDataTerm())); - for (final Term t : term.getCases()) { - occ.enqueueWalker(new ResetWalker(t)); - } - } - term.mTmpCtr = 0; - } - } - - /** - * Compute the occurrence counter for the sub terms. This method does not - * keep any state in this object. This should prevent memory leaks since - * this object can be kept alive and the garbage collector is still free to - * collect the counter map. - * @param t The term to count. - */ - public void count(final Term t) { - run(new CountWalker(t)); - } - - public void reset(final Term t) { - run(new ResetWalker(t)); - } - -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PolymorphicFunctionSymbol.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PolymorphicFunctionSymbol.java deleted file mode 100644 index 1098894e909..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PolymorphicFunctionSymbol.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.HashMap; - - -public class PolymorphicFunctionSymbol extends FunctionSymbolFactory { - - private final Sort[] mTypeParams; - private final Sort[] mParamSorts; - private final Sort mResultSort; - private final int mFlags; - - PolymorphicFunctionSymbol(String name, Sort[] typeParams, Sort[] params, - Sort result, int flags) { - super(name); - mTypeParams = typeParams; - mParamSorts = params; - mResultSort = result; - mFlags = flags; - } - - @Override - public int getFlags(String[] indices, Sort[] paramSorts, Sort result) { - return mFlags; - } - - @Override - public Sort getResultSort( - String[] indices, Sort[] paramSorts, Sort result) { - if (indices != null) { - return null; - } - if (paramSorts.length != mParamSorts.length) { - return null; - } - final HashMap unifier = new HashMap(); - for (int i = 0; i < paramSorts.length; i++) { - if (!mParamSorts[i].unifySort(unifier, paramSorts[i])) { - return null; - } - } - if (result != null) { // NOPMD - if (!mResultSort.unifySort(unifier, result.getRealSort())) { - return null; - } - return result; - } else { - final Sort[] mapping = new Sort[mTypeParams.length]; - for (int i = 0; i < mTypeParams.length; i++) { - mapping[i] = unifier.get(mTypeParams[i]); - // check if there are still unresolved type parameters. - if (mapping[i] == null) { - return null; - } - } - return mResultSort.mapSort(mapping); - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PrintTerm.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PrintTerm.java deleted file mode 100644 index ed6d042cc4f..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/PrintTerm.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.io.IOException; -import java.util.ArrayDeque; - -/** - * This class converts a term into an Appendable (StringBuilder, - * OutputStreamWriter, etc). It is non-recursive to prevent stack overflow. - * @author Jochen Hoenicke - */ -public class PrintTerm { - /* This class iterates the term in a non-recursive way. To achieve this - * it uses a todo stack, which contains terms and/or strings. - */ - protected final ArrayDeque mTodo = new ArrayDeque<>(); - /** - * Convert a term into an appendable. - * @param appender The appendable. - * @param term The term. - */ - public void append(final Appendable appender, final Term term) { - try { - mTodo.add(term); - run(appender); - } catch (final IOException ex) { - throw new RuntimeException("Appender throws IOException", ex); - } - } - /** - * Convert a sort into an appendable. Note that sorts can get pretty long, - * too. Hence we do this non-recursively to prevent stack overflows. - * @param appender The appendable. - * @param sort The sort. - */ - public void append(final Appendable appender, final Sort sort) { - try { - mTodo.add(sort); - run(appender); - } catch (final IOException ex) { - throw new RuntimeException("Appender throws IOException", ex); - } - } - - /** - * Append an s-expression. The s-expression might contain terms. - * @param appender The appendable. - * @param sexpr The s-expression. - */ - public void append(final Appendable appender, final Object[] sexpr) { - try { - mTodo.add(sexpr); - run(appender); - } catch (final IOException ex) { - throw new RuntimeException("Appender throws IOException", ex); - } - } - - /** - * Ensure the identifier is SMTLIB 2 compliant. If a symbol that is not - * allowed due to the SMTLIB 2 standard is encountered, the whole identifier - * will be quoted. - * @param id An unquoted identifier. - * @return SMTLIB 2 compliant identifier. - */ - public static String quoteIdentifier(final String id) { - assert id.indexOf('|') < 0 && id.indexOf('\\') < 0; - for (int idx = 0; idx < id.length(); idx++) { - final char c = id.charAt(idx); - if (!(c >= 'A' && c <= 'Z') - && !(c >= 'a' && c <= 'z') - && !(c >= '0' && c <= '9' && idx > 0) - && "~!@$%^&*_+-=<>.?/".indexOf(c) < 0) { - return "|" + id + "|"; - } - } - return id; - } - - /** - * Ensure that object can be used as SMT-LIB 2 compliant identifier. - * otherwise the input is returned. - * @param value some object. - * @return quoted identifier if value is String, otherwise value - * (the input) is returned. - */ - public static Object quoteObjectIfString(final Object value) { - if (value instanceof String) { - final String valueAsString = String.valueOf(value); - if (valueAsString.charAt(0) == '|' && valueAsString.charAt(valueAsString.length() - 1) == '|') { - return value; - } else { - return quoteIdentifier(valueAsString); - } - } else { - return value; - } - } - - /** - * Walk over a term and add its components to the todo queue. - * - * @param term the term. - */ - protected void walkTerm(final Term term) { - term.toStringHelper(mTodo); - } - - /** - * Walk over a sort and add its components to the todo queue. - * - * @param sort the sort. - */ - protected void walkSort(final Sort sort) { - sort.toStringHelper(mTodo); - } - - private void run(final Appendable appender) throws IOException { - while (!mTodo.isEmpty()) { - final Object next = mTodo.removeLast(); - if (next instanceof Term) { - walkTerm((Term) next); - } else if (next instanceof Sort) { - walkSort((Sort) next); - } else if (next instanceof Object[]) { - final Object[] arr = (Object[]) next; - mTodo.addLast(")"); - for (int i = arr.length - 1; i >= 0; i--) { - mTodo.addLast(arr[i]); - if (i > 0) { - mTodo.addLast(" "); - } - } - appender.append('('); - } else { - appender.append(next.toString()); - } - } - } - - @Override - public String toString() { - return "[PrintTerm: " + mTodo + "]"; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuantifiedFormula.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuantifiedFormula.java deleted file mode 100644 index 724e8824ea5..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuantifiedFormula.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -//import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents a quantified formula in SMTLIB 2. This class represents the - * SMTLIB 2 construct - * 
- * (forall ((var_1 sort_1) ... (var_n sort_n)) ...)
- *
or - * 
- * (exists ((var_1 sort_1) ... (var_n sort_n)) ...)
- *
. - * - * A quantified formula is created by - * {@link Script#quantifier(int, TermVariable[], Term, Term[][])}. - * - * @author hoenicke - */ -public class QuantifiedFormula extends Term { - public static final int EXISTS = 0; - public static final int FORALL = 1; - - private final int mQuantifier; - private final TermVariable[] mVariables; - private final Term mSubFormula; - - QuantifiedFormula(final int quant, final TermVariable[] vars, final Term f, final int hash) { - super(hash); - mQuantifier = quant; - mVariables = vars; - mSubFormula = f; - } - - /** - * @return the quantifier - */ - public int getQuantifier() { - return mQuantifier; - } - - /** - * Get the quantified variables. - * @return the variables - */ - public TermVariable[] getVariables() { - return mVariables; - } - - /** - * Get the formula under the quantifier. - * @return the sub-formula. - */ - public Term getSubformula() { - return mSubFormula; - } - - @Override - public Sort getSort() { - return mSubFormula.getSort(); - } - - public static final int hashQuantifier( - final int quant, final TermVariable[] vars, final Term f) { - return //Arrays.hashCode(vars) ^ f.hashCode() ^ quant; - HashUtils.hashJenkins(f.hashCode() ^ quant, (Object[]) vars); - } - - @Override - public void toStringHelper(final ArrayDeque mTodo) { - // Add subterm to stack. - mTodo.addLast(")"); - mTodo.addLast(getSubformula()); - mTodo.addLast(")) "); - - // Add variables - final TermVariable[] vars = getVariables(); - for (int i = vars.length - 1; i > 0; i--) { - mTodo.addLast(vars[i].getSort()); - mTodo.addLast(") (" + vars[i] + " "); - } - mTodo.addLast(vars[0].getSort()); - - // Print out the quantifier. - mTodo.addLast("(" + (getQuantifier() == EXISTS ? "exists" : "forall") - + " ((" + vars[0] + " "); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuotedObject.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuotedObject.java deleted file mode 100644 index a28b1c4dcfb..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/QuotedObject.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * A quoted object is used as value for string literals in SMTLIB 2. - * The SMTLIB string literal - * 
"..."
- * is represented by a ConstantTerm whose value is a quoted object. The - * underlying value is the string in parsed form, i.e., escape sequences using - * backslash are removed and the surrounding quotes are removed. - * - * A QuotedObject can also be used to quote arbitrary java objects. These can - * be used in annotations and will produce syntactically correct SMTLIB - * scripts if they are dumped. - * - * @author hoenicke - */ -public class QuotedObject { - /** - * The underlying Object. - */ - private final String mValue; - - /** - * True, if this needs to be quoted using the smt-lib 2.5 syntax. - */ - private boolean mIsSMTLIB25; - - /** - * Create a quoted object. - * @param value the value that is quoted. Usually this is a string - * without the quotes. - */ - public QuotedObject(String value) { - this(value, true); - assert value.indexOf('\\') < 0 && value.indexOf('\"') < 0; - } - - /** - * Create a quoted object. - * @param value the value that is quoted. Usually this is a string - * without the quotes. - */ - public QuotedObject(String value, boolean isSMTLIB25) { - mValue = value; - mIsSMTLIB25 = isSMTLIB25; - } - - /** - * Get the underlying object. - * @return the underlying object. - */ - public String getValue() { - return mValue; - } - - private static String quoteString20(String str) { - final StringBuilder sb = new StringBuilder(); - sb.append('\"'); - for (int i = 0; i < str.length(); i++) { - final char c = str.charAt(i); - switch(c) { - case '\\': - sb.append("\\\\"); - break; - case '\"': - sb.append("\\\""); - break; - default: - sb.append(c); - break; - } - } - return sb.append('\"').toString(); - } - - private static String quoteString25(String str) { - final StringBuilder sb = new StringBuilder(); - sb.append('\"'); - for (int i = 0; i < str.length(); i++) { - final char c = str.charAt(i); - if (c == '\"') { - sb.append("\"\""); - } else { - sb.append(c); - } - } - return sb.append('\"').toString(); - } - - /** - * Returns the representation of the string. This adds the - * quotes and converts escape sequences appropriately. - * @return the SMTLIB compatible string representation. - */ - @Override - public String toString() { - return mIsSMTLIB25 ? quoteString25(mValue) : quoteString20(mValue); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Rational.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Rational.java deleted file mode 100644 index 1a928890021..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Rational.java +++ /dev/null @@ -1,931 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigInteger; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Class that represents a rational number num/denom, - * where num and denom are BigInteger. This class also handles - * infinity and NAN. - * - * Internally, the numbers are always kept in reduced form; the - * denominator is always kept non-negative. A zero denominator - * with non-zero numerator indicates positive or negative infinity. - * The number 0/0 is used to represent NAN (not a number). - * - * Every operation that involves NAN gives NAN as result. - * The non-obvious rules for ZERO, INFINITY, and NAN are: - * 
- * ONE.div(NEGATIVE_INFINITY).isNegative() = false  (no negative ZERO)
- * ZERO.inverse() = POSITIVE_INFINITY
- * POSITIVE_INFINITY.add(finite number) = POSITIVE_INFINITY.
- * POSITIVE_INFINITY.add(NEGATIVE_INFINITY) = NAN
- * ZERO.mul(POSITIVE_INFINITY) = ZERO.mul(NEGATIVE_INFINITY) = NAN
- * number.div(ZERO) = POSITIVE_INFINITY.mul(number.signum())
- * NAN.isIntegral = POSITIVE_INFINITY.isIntegral = true
- * NAN.floor() = NAN;
- * POSITIVE_INFINITY.floor() = POSITIVE_INFINITY;
- * NAN.frac() = POSITIVE_INFINITY.frac() = ZERO;
- *
- * - * This class only uses bigintegers if either numerator or - * denominator does not fit into an int. - * @author Juergen Christ, Jochen Hoenicke - */ -public class Rational implements Comparable { - /** - * The numerator if num and denom are in int range. - */ - int mNum; - /** - * The denominator if num and denom are in int range. - */ - int mDenom; - - static class BigRational extends Rational { - /** - * The numerator if num or denom is outside int range. - */ - BigInteger mBignum; - /** - * The denominator if num or denom is outside int range. - */ - BigInteger mBigdenom; - - /** - * Construct a rational from two bigints. The constructor - * is private and does not normalize. Use the static - * constructor valueOf instead. - * @param nom Numerator - * @param denom Denominator - */ - private BigRational(final BigInteger nom,final BigInteger denom) { - super(nom.signum(),1); - mBignum = nom; - mBigdenom = denom; - } - - /** - * Return a new rational representing this + other. - * @param other Rational to add. - * @return Sum of this and other. - */ - @Override - public Rational add(final Rational other) { - /* fast path */ - if (other == Rational.ZERO) { - return this; - } - - final BigInteger tdenom = denominator(); - final BigInteger odenom = other.denominator(); - if (tdenom.equals(odenom)) { - /* another very simple case */ - return valueOf(numerator().add(other.numerator()), tdenom); - } - final BigInteger gcd = tdenom.gcd(odenom); - final BigInteger tdenomgcd = tdenom.divide(gcd); - final BigInteger odenomgcd = odenom.divide(gcd); - final BigInteger newnum = numerator().multiply(odenomgcd) - .add(other.numerator().multiply(tdenomgcd)); - final BigInteger newdenom = tdenom.multiply(odenomgcd); - return valueOf(newnum, newdenom); - } - - /** - * Returns a new rational equal to -this. - * @return -this - */ - @Override - public Rational negate() { - return Rational.valueOf(mBignum.negate(), mBigdenom); - } - - /** - * Return a new rational representing this * other. - * @param other Rational to multiply. - * @return Product of this and other. - */ - @Override - public Rational mul(final Rational other) { - /* fast path */ - if (other == Rational.ONE) { - return this; - } - if (other == Rational.ZERO) { - return other; - } - if (other == Rational.MONE) { - return negate(); - } - - final BigInteger newnum = numerator().multiply(other.numerator()); - final BigInteger newdenom = denominator().multiply(other.denominator()); - return valueOf(newnum, newdenom); - } - - /** - * Return a new rational representing this * other. - * @param other big integer to multiply. - * @return Product of this and other. - */ - @Override - public Rational mul(final BigInteger other) { - if (other.bitLength() < 2) { - /* fast path */ - final int oint = other.intValue(); - if (oint == 1) { - return this; - } - if (oint == -1) { - return negate(); - } - if (oint == 0) { - return Rational.ZERO; - } - } - return valueOf(numerator().multiply(other), denominator()); - } - - /** - * Return a new rational representing this / other. - * @param other Rational to divide. - * @return Quotient of this and other. - */ - @Override - public Rational div(final Rational other) { - if (other == Rational.ONE) { - return this; - } - if (other == Rational.MONE) { - return negate(); - } - final BigInteger denom = denominator().multiply(other.numerator()); - BigInteger nom = numerator().multiply(other.denominator()); - // +-inf : -c = -+inf - if (denom.equals(BigInteger.ZERO) - && other.numerator().signum() == -1) { - nom = nom.negate(); - } - return valueOf(nom,denom); - } - - /** - * Return a new rational representing this / other. - * @param other Rational to divide. - * @return Quotient of this and other. - */ - public Rational idiv(final Rational other) { - BigInteger num = denominator().multiply(other.numerator()); - final BigInteger denom = numerator().multiply(other.denominator()); - // +-inf : -c = -+inf - if (denom.equals(BigInteger.ZERO) && numerator().signum() == -1) { - num = num.negate(); - } - return valueOf(num,denom); - } - - /** - * Returns a new rational representing the inverse of this. - * @return Inverse of this. - */ - @Override - public Rational inverse() { - return valueOf(mBigdenom, mBignum); - } - - /** - * Compute the gcd of two rationals (this and other). The gcd - * is the rational number, such that dividing this and other with - * the gcd will yield two co-prime integers. - * @param other the second rational argument. - * @return the gcd of this and other. - */ - @Override - public Rational gcd(final Rational other) { - if (other == Rational.ZERO) { - return this.abs(); - } - final BigInteger tdenom = denominator(); - final BigInteger odenom = other.denominator(); - final BigInteger gcddenom = tdenom.gcd(odenom); - final BigInteger denom = tdenom.divide(gcddenom).multiply(odenom); - final BigInteger num = numerator().gcd(other.numerator()); - return Rational.valueOf(num, denom); - } - - @Override - public int compareTo(final Rational o) { - final BigInteger valthis = numerator().multiply(o.denominator()); - final BigInteger valo = o.numerator().multiply(denominator()); - return valthis.compareTo(valo); - } - - @Override - public boolean equals(final Object o) { - if (o instanceof BigRational) { - final BigRational r = (BigRational) o; - // Works thanks to normalization!!! - return mBignum.equals(r.mBignum) - && mBigdenom.equals(r.mBigdenom); - } - if (o instanceof MutableRational) { - return ((MutableRational) o).equals(this); - } - return false; - } - - @Override - public BigInteger numerator() { - return mBignum; - } - @Override - public BigInteger denominator() { - return mBigdenom; - } - - @Override - public int hashCode() { - final int hashNum = HashUtils.hashJenkins(0, mBignum.toByteArray()); - return HashUtils.hashJenkins(hashNum, mBigdenom.toByteArray()); - } - - @Override - public String toString() { - if (mBigdenom.equals(BigInteger.ONE)) { - return mBignum.toString(); - } - return mBignum.toString() + "/" + mBigdenom.toString(); - } - - /** - * Check whether this rational represents an integral value. Both - * infinity values are treated as integral. - * @return true iff value is integral. - */ - @Override - public boolean isIntegral() { - return mBigdenom.equals(BigInteger.ONE); - } - /** - * Return a new rational representing the biggest integral rational not - * bigger than this. - * @return Next smaller integer of this. - */ - @Override - public Rational floor() { - if (denominator().equals(BigInteger.ONE)) { - return this; - } - BigInteger div = numerator().divide(denominator()); - if (numerator().signum() < 0) { - div = div.subtract(BigInteger.ONE); - } - return Rational.valueOf(div,BigInteger.ONE); - } - /** - * Returns the fractional part of the rational, i.e. the - * number this.sub(this.floor()). - * @return Next smaller integer of this. - */ - @Override - public Rational frac() { - if (mBigdenom.equals(BigInteger.ONE)) { - return Rational.ZERO; - } - BigInteger newnum = mBignum.mod(mBigdenom); - if (newnum.signum() < 0) { - newnum = newnum.add(mBigdenom); - } - return Rational.valueOf(newnum, mBigdenom); - } - /** - * Return a new rational representing the smallest integral rational not - * smaller than this. - * @return Next bigger integer of this. - */ - @Override - public Rational ceil() { - if (denominator().equals(BigInteger.ONE)) { - return this; - } - BigInteger div = numerator().divide(denominator()); - if (numerator().signum() > 0) { - div = div.add(BigInteger.ONE); - } - return Rational.valueOf(div,BigInteger.ONE); - } - @Override - public Rational abs() { - return valueOf(mBignum.abs(), mBigdenom); - } - } - - /** - * Construct a rational from two ints. The constructor - * is private and does not normalize. Use the static - * constructor valueOf instead. - * @param num The numerator. - * @param denom The denominator. - */ - private Rational(final int num, final int denom) { - mNum = num; - mDenom = denom; - } - - /** - * Construct a rational from two bigints. Use this method - * to create a rational number if the numerator or denominator - * may be to big to fit in an int. This method normalizes - * the rational number and does partial unification. - * - * @param bignum The numerator. - * @param bigdenom The denominator. - * @return a rational representing numerator/denominator. - */ - public static Rational valueOf(BigInteger bignum, BigInteger bigdenom) { - final int cp = bigdenom.signum(); - if (cp < 0) { - bignum = bignum.negate(); - bigdenom = bigdenom.negate(); - } else if (cp == 0) { - return valueOf(bignum.signum(), 0); - } - if (!bigdenom.equals(BigInteger.ONE)) { - final BigInteger norm = gcd(bignum, bigdenom).abs(); - if (!norm.equals(BigInteger.ONE)) { - bignum = bignum.divide(norm); - bigdenom = bigdenom.divide(norm); - } - } - if (bigdenom.bitLength() < 32 && bignum.bitLength() < 32) { - return valueOf(bignum.intValue(), bigdenom.intValue()); - } else { - return new BigRational(bignum, bigdenom); - } - } - - /** - * Construct a rational from two longs. Use this method - * to create a rational number. This method normalizes - * the rational number and may return a previously created - * one. - * This method does not work if called with value - * Long.MIN_VALUE. - * - * @param newnum The numerator. - * @param newdenom The denominator. - * @return a rational representing numerator/denominator. - */ - public static Rational valueOf(long newnum, long newdenom) { - if (newdenom != 1) { - long gcd2 = Math.abs(gcd(newnum, newdenom)); - if (gcd2 == 0) { - return NAN; - } - if (newdenom < 0) { - gcd2 = -gcd2; - } - newnum /= gcd2; - newdenom /= gcd2; - } - - if (newdenom == 1) { - if (newnum == 0) { - return ZERO; - } - if (newnum == 1) { - return ONE; - } - if (newnum == -1) { - return MONE; - } - } else if (newdenom == 0) { - if (newnum == 1) { - return POSITIVE_INFINITY; - } else { - return NEGATIVE_INFINITY; - } - } - - if (Integer.MIN_VALUE <= newnum && newnum <= Integer.MAX_VALUE - && newdenom <= Integer.MAX_VALUE) { - return new Rational((int) newnum, (int) newdenom); - } - return new BigRational(BigInteger.valueOf(newnum), - BigInteger.valueOf(newdenom)); - } - - /** - * Calculates the greatest common divisor of two numbers. Expects two - * nonnegative values. - * @param a First number - * @param b Second Number - * @return Greatest common divisor - */ - public static int gcd(int a, int b) { - /* This is faster for integer */ - //assert(a >= 0 && b >= 0); - while (b != 0) { - final int t = a % b; - a = b; - b = t; - } - return a; - } - - /** - * Calculates the greatest common divisor of two numbers. - * @param a First number - * @param b Second Number - * @return Greatest common divisor - */ - public static long gcd(long a, long b) { - /* This is faster for longs on 32-bit architectures */ - if (a < 0) { - a = -a; - } - if (b < 0) { - b = -b; - } - if (a == 0 || b == 1) { - return b; - } - if (b == 0 || a == 1) { - return a; - } - final int ashift = Long.numberOfTrailingZeros(a); - final int bshift = Long.numberOfTrailingZeros(b); - a >>= ashift; - b >>= bshift; - while (a != b) { - long t; - if (a < b) { - t = b - a; - b = a; - } else { - if (b == 1) { - a = b; - break; - } - t = a - b; - } - do { - t >>= 1; - } while (((int) t & 1) == 0); - a = t; - } - return a << Math.min(ashift, bshift); - } - - /** - * Compute the gcd of two BigInteger. This is the same - * as {@code i1.gcd(i2)}, but it is more efficient for small numbers. - * @param i1 the first big integer. - * @param i2 the second big integer. - * @return the gcd of i1 and i2. - */ - public static BigInteger gcd(final BigInteger i1, final BigInteger i2) { - if (i1 == BigInteger.ONE || i2 == BigInteger.ONE) { - return BigInteger.ONE; - } - final int l1 = i1.bitLength(); - final int l2 = i2.bitLength(); - if (l1 < 31 && l2 < 31) { - return BigInteger.valueOf(gcd(i1.intValue(), i2.intValue())); - } else if (l1 < 63 && l2 < 63) { - return BigInteger.valueOf(gcd(i1.longValue(), i2.longValue())); - } else { - return i1.gcd(i2); - } - } - - /** - * Return a new rational representing this + other. - * @param other Rational to add. - * @return Sum of this and other. - */ - public Rational add(final Rational other) { - /* fast path */ - if (other == Rational.ZERO) { - return this; - } - if (this == Rational.ZERO) { - return other; - } - if (other instanceof BigRational) { - return other.add(this); - } else { - if (mDenom == other.mDenom) { - /* handle gcd = 0 correctly - * two INFINITYs with same sign give INFINITY, - * otherwise it gives NAN. - */ - if (mDenom == 0) { - return mNum == other.mNum ? this : NAN; - } - /* a common, very simple case, e.g. for integers */ - return valueOf((long) mNum + other.mNum, mDenom); - } - /* This also handles infinity/NAN + normal correctly. */ - final int gcd = gcd(mDenom, other.mDenom); - final long denomgcd = mDenom / gcd; - final long otherdenomgcd = other.mDenom / gcd; - final long newdenom = denomgcd * other.mDenom; - final long newnum = otherdenomgcd * mNum + denomgcd * other.mNum; - return valueOf(newnum, newdenom); - } - } - - /** - * Computes {@code this + (fac1*fac2)}. - * @param fac1 one of the factors. - * @param fac2 the other factor. - * @return the result of the computation. - */ - public Rational addmul(final Rational fac1,final Rational fac2) { - return add(fac1.mul(fac2)); - } - - /** - * Computes {@code (this - s) / d}. - * @param s the rational to subtract. - * @param d the divisor. - * @return the result of the computation. - */ - public Rational subdiv(final Rational s,final Rational d) { - return sub(s).div(d); - } - /** - * Returns a new rational equal to -this. - * @return -this. - */ - public Rational negate() { - return Rational.valueOf(-(long)mNum, mDenom); - } - /** - * Return a new rational representing this - other. - * @param other Rational to subtract. - * @return Difference of this and other. - */ - public Rational sub(final Rational other) { - return add(other.negate()); - } - /** - * Return a new rational representing this * other. - * @param other Rational to multiply. - * @return Product of this and other. - */ - public Rational mul(final Rational other) { - /* fast path */ - if (other == Rational.ONE) { - return this; - } - if (this == Rational.ONE) { - return other; - } - if (other == Rational.MONE) { - return negate(); - } - if (this == Rational.MONE) { - return other.negate(); - } - if (other instanceof BigRational) { - return other.mul(this); - } - - final long newnum = (long)mNum * other.mNum; - final long newdenom = (long)mDenom * other.mDenom; - return valueOf(newnum, newdenom); - } - - /** - * Return a new rational representing this * other. - * @param other big integer to multiply. - * @return Product of this and other. - */ - public Rational mul(final BigInteger other) { - if (other.bitLength() < 32) { // NOCHECKSTYLE - /* fast path */ - final int oint = other.intValue(); - if (oint == 1) { - return this; - } - if (oint == -1) { - return negate(); - } - final long newnum = (long)mNum * oint; - return valueOf(newnum, mDenom); - } - - if (this == Rational.ONE) { - return valueOf(other, BigInteger.ONE); - } - if (this == Rational.MONE) { - return valueOf(other.negate(), BigInteger.ONE); - } - - return valueOf(numerator().multiply(other), denominator()); - } - /** - * Return a new rational representing this / other. - * @param other Rational to divide. - * @return Quotient of this and other. - */ - public Rational div(final Rational other) { - if (other == Rational.ONE) { - return this; - } - if (other == Rational.MONE) { - return negate(); - } - - if (other instanceof BigRational) { - return ((BigRational)other).idiv(this); - } - - /* fast path */ - long newnum = (long)mNum * other.mDenom; - final long newdenom = (long)mDenom * other.mNum; - // +-inf : -c = -+inf - if (newdenom == 0 && other.mNum < 0) { - newnum = -newnum; - } - return valueOf(newnum, newdenom); - } - - /** - * Compute the gcd of two rationals (this and other). The gcd is the rational - * number, such that dividing this and other with the gcd will yield two - * co-prime integers. The gcd is always non-negative. - * - * @param other the second rational argument. - * @return the gcd of this and other. - */ - public Rational gcd(final Rational other) { - if (this == Rational.ZERO) { - return other.abs(); - } - if (other == Rational.ZERO) { - return this.abs(); - } - if (other instanceof BigRational) { - return other.gcd(this); - } - /* new numerator = gcd(num, other.num) */ - /* new denominator = lcm(denom, other.denom) */ - final int gcddenom = gcd(mDenom, other.mDenom); - final long denom = ((long) (mDenom / gcddenom)) * other.mDenom; - final long num = gcd(mNum < 0 ? -(long) mNum : mNum, other.mNum < 0 ? -(long) other.mNum : other.mNum); - return valueOf(num, denom); - } - /** - * Returns a new rational representing the inverse of this. - * @return Inverse of this. - */ - public Rational inverse() { - return valueOf(mDenom, mNum); - } - - /** - * Check whether this rational is negative. - * @return true iff this rational is negative. - */ - public boolean isNegative() { - return mNum < 0; - } - /** - * Return the sign of this rational. The sign will be -1, 0, or 1 if this - * rational is negative, zero, or positive. - * @return The sign of this rational. - */ - public int signum() { - return mNum < 0 ? -1 : mNum == 0 ? 0 : 1; - } - - @Override - /** - * Compares this rational with the other. - * @param o the other rational. - * @return -1, if this < o; 1, if this > o; 0 if they are equal. - */ - public int compareTo(final Rational o) { - if (o instanceof BigRational) { - return -o.compareTo(this); - } - - /* handle infinities and nan */ - if (o.mDenom == mDenom) { - return mNum < o.mNum ? -1 : mNum == o.mNum ? 0 : 1; - } - final long valt = (long)mNum * o.mDenom; - final long valo = (long)o.mNum * mDenom; - return valt < valo ? -1 : valt == valo ? 0 : 1; - } - @Override - /** - * Compares this rational with the other. This works with - * Rational and MutableRational. - * @param o the other rational. - * @return true if this equals o, false otherwise. - */ - public boolean equals(final Object o) { - if (o instanceof Rational) { - if (o instanceof BigRational) { - return false; - } - final Rational r = (Rational) o; - // Works thanks to normalization!!! - return mNum == r.mNum && mDenom == r.mDenom; - } - if (o instanceof MutableRational) { - return ((MutableRational) o).equals(this); - } - return false; - } - - /** - * Get the numerator of this rational. - * @return the numerator. - */ - public BigInteger numerator() { - return BigInteger.valueOf(mNum); - } - - /** - * Get the denominator of this rational. - * @return the denominator. - */ - public BigInteger denominator() { - return BigInteger.valueOf(mDenom); - } - - /** - * Computes a hashcode. The hashcode is computed as - * {@code 257 * numerator + denominator} if both fit into an integer and - * {@code 257 * numerator().hashCode() + denominator().hashCode()} if big - * integers are necessary. - * @return the hashcode. - */ - @Override - public int hashCode() { - return HashUtils.hashJenkins(mNum, mDenom); - } - /** - * Get a string representation of this number. This is - * {@code numerator()+ "/" + denominator()} except for - * infinity ({@code "inf"}), nan ({@code "nan"}), or minus - * infinity ({@code "-inf"}). - * @return the string representation. - */ - @Override - public String toString() { - if (mDenom == 0) { - return mNum > 0 ? "inf" : mNum == 0 ? "nan" : "-inf"; - } - if (mDenom == 1) { - return String.valueOf(mNum); - } - return mNum + "/" + mDenom; - } - /** - * Check whether this rational represents an integral value. Both infinity - * values are treated as integral. - * @return true iff value is integral. - */ - public boolean isIntegral() { - return mDenom <= 1; - } - /** - * Return a new rational representing the biggest integral rational not - * bigger than this. - * @return Next smaller integer of this. - */ - public Rational floor() { - if (mDenom <= 1) { - return this; - } - int div = mNum / mDenom; - // Java rounds the wrong way for negative numbers. - // We know that the division is not exact due to - // normalization and mdenom != 1, so subtracting - // one fixes the result for negative numbers. - if (mNum < 0) { - div--; - } - return valueOf(div, 1); - } - /** - * Returns the fractional part of the rational, i.e. the - * number this.sub(this.floor()). - * @return Next smaller integer of this. - */ - public Rational frac() { - if (mDenom <= 1) { - return Rational.ZERO; - } - int newnum = mNum % mDenom; - // Java rounds the wrong way for negative numbers. - // We know that the division is not exact due to - // normalization and mdenom != 1, so subtracting - // one fixes the result for negative numbers. - if (newnum < 0) { - newnum += mDenom; - } - return valueOf(newnum, mDenom); - } - /** - * Return a new rational representing the smallest integral rational not - * smaller than this. - * @return Next bigger integer of this. - */ - public Rational ceil() { - if (mDenom <= 1) { - return this; - } - int div = mNum / mDenom; - // Java rounds the wrong way for positive numbers. - // We know that the division is not exact due to - // normalization and mdenom != 1, so adding - // one fixes the result for positive numbers. - if (mNum > 0) { - div++; - } - return valueOf(div, 1); - } - /** - * Compute the absolute of this rational. - * @return Rational that is equal to the absolute value of this rational. - */ - public Rational abs() { - return valueOf(Math.abs((long) mNum), mDenom); - } - - /** - * Positive infinity. Used to represent the result of 1/0. - */ - public final static Rational POSITIVE_INFINITY = new Rational(1,0); - /** - * Not a number. Used to represent the result of 0/0. - */ - public final static Rational NAN = new Rational(0,0); - /** - * Negative infinity. Used to represent the result of -1/0. - */ - public final static Rational NEGATIVE_INFINITY = new Rational(-1,0); - /** - * The number 0. - */ - public final static Rational ZERO = new Rational(0,1); - /** - * The number 1. - */ - public final static Rational ONE = new Rational(1,1); - /** - * The number -1. - */ - public final static Rational MONE = new Rational(-1,1); - /** - * The number 2. - */ - public static final Rational TWO = new Rational(2,1); - - /** - * Creates a constant term containing this rational. - * @param sort the sort of the constant term that should be created. - * @return a constant term with this rational value. - * @throws SMTLIBException if term is infinite or NaN, if the - * sort is not numeric, or if the term is not integral and the sort - * is Int. - */ - public Term toTerm(final Sort sort) { - return sort.getTheory().constant(this, sort); - } - /** - * Check whether this rational corresponds to a (finite) rational value. - * This function can be used to test for infinites and NaNs. - * @return true if and only if this rational is not infinite or NaN. - */ - public boolean isRational() { - return mDenom != 0; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ReasonUnknown.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ReasonUnknown.java deleted file mode 100644 index 95c9e41608b..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/ReasonUnknown.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * The reason why we returned unknown. Note that the SMTLIB standard at the moment only allows "memout" and - * "incomplete", but "timeout" and "crashed" and "cancelled" seem to be a good idea, too... - * - * @author Juergen Christ - */ -public enum ReasonUnknown { - MEMOUT { - @Override - public String toString() { - return "memout"; - } - }, - INCOMPLETE { - @Override - public String toString() { - return "incomplete"; - } - }, - TIMEOUT { - @Override - public String toString() { - return "timeout"; - } - }, - CRASHED { - @Override - public String toString() { - return "crashed"; - } - }, - CANCELLED { - @Override - public String toString() { - return "cancelled"; - } - }, - OTHER { - @Override - public String toString() { - return "other"; - } - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBConstants.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBConstants.java deleted file mode 100644 index cce0706103f..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBConstants.java +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (C) 2019 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * This interface contains the names of all SMTLIB functions, attributes, and values. - * - * @author Jochen Hoenicke - */ -public interface SMTLIBConstants { - // Base Theory - public static final String BOOL = "Bool"; - public static final String NOT = "not"; - public static final String AND = "and"; - public static final String OR = "or"; - public static final String IMPLIES = "=>"; - public static final String EQUALS = "="; - public static final String DISTINCT = "distinct"; - public static final String XOR = "xor"; - public static final String ITE = "ite"; - public static final String TRUE = "true"; - public static final String FALSE = "false"; - public static final String FUNC = "->"; - - // Arithmetic - public static final String INT = "Int"; - public static final String REAL = "Real"; - public static final String PLUS = "+"; - public static final String MINUS = "-"; - public static final String MUL = "*"; - public static final String DIVIDE = "/"; - public static final String DIV = "div"; - public static final String MOD = "mod"; - public static final String DIVISIBLE = "divisible"; - public static final String ABS = "abs"; - public static final String GT = ">"; - public static final String GEQ = ">="; - public static final String LT = "<"; - public static final String LEQ = "<="; - public static final String TO_REAL = "to_real"; - public static final String TO_INT = "to_int"; - public static final String IS_INT = "is_int"; - - // Arrays - public static final String ARRAY = "Array"; - public static final String STORE = "store"; - public static final String SELECT = "select"; - public static final String CONST = "const"; - public static final String ARRAYOF = ".arrayof"; - - // Datatypes - public static final String IS = "is"; - - // Bitvector - public static final String BITVEC = "BitVec"; - public static final String CONCAT = "concat"; - public static final String EXTRACT = "extract"; - public static final String BVNOT = "bvnot"; - public static final String BVAND = "bvand"; - public static final String BVOR = "bvor"; - public static final String BVNEG = "bvneg"; - public static final String BVADD = "bvadd"; - public static final String BVMUL = "bvmul"; - public static final String BVUDIV = "bvudiv"; - public static final String BVUREM = "bvurem"; - public static final String BVSHL = "bvshl"; - public static final String BVLSHR = "bvlshr"; - public static final String BVNAND = "bvnand"; - public static final String BVNOR = "bvnor"; - public static final String BVXOR = "bvxor"; - public static final String BVXNOR = "bvxnor"; - public static final String BVCOMP = "bvcomp"; - public static final String BVSUB = "bvsub"; - public static final String BVSDIV = "bvsdiv"; - public static final String BVSREM = "bvsrem"; - public static final String BVSMOD = "bvsmod"; - public static final String BVASHR = "bvashr"; - public static final String REPEAT = "repeat"; - public static final String ZERO_EXTEND = "zero_extend"; - public static final String SIGN_EXTEND = "sign_extend"; - public static final String ROTATE_LEFT = "rotate_left"; - public static final String ROTATE_RIGHT = "rotate_right"; - public static final String BVULT = "bvult"; - public static final String BVULE = "bvule"; - public static final String BVUGT = "bvugt"; - public static final String BVUGE = "bvuge"; - public static final String BVSLT = "bvslt"; - public static final String BVSLE = "bvsle"; - public static final String BVSGT = "bvsgt"; - public static final String BVSGE = "bvsge"; - public static final String PREFIX_BINARY = "#b"; - public static final String PREFIX_HEX = "#x"; - - // Floating Point - public static final String FLOATINGPOINT = "FloatingPoint"; - public static final String ROUNDINGMODE = "RoundingMode"; - public static final String FP = "fp"; - public static final String TO_FP = "to_fp"; - public static final String TO_FP_UNSIGNED = "to_fp_unsigned"; - public static final String FP_TO_UBV = "fp.to_ubv"; - public static final String FP_TO_SBV = "fp.to_sbv"; - public static final String FP_INFINITY = "+oo"; - public static final String FP_NEG_INFINITY = "-oo"; - public static final String FP_ZERO = "+zero"; - public static final String FP_NEG_ZERO = "-zero"; - public static final String FP_NAN = "NaN"; - public static final String FLOAT16 = "Float16"; - public static final String FLOAT32 = "Float32"; - public static final String FLOAT64 = "Float64"; - public static final String FLOAT128 = "Float128"; - public static final String ROUND_NEAREST_TIES_TO_EVEN = "roundNearestTiesToEven"; - public static final String ROUND_NEAREST_TIES_TO_AWAY = "roundNearestTiesToAway"; - public static final String ROUND_TOWARDS_POSITIVE = "roundTowardsPositive"; - public static final String ROUND_TOWARDS_NEGATIVE = "roundTowardsNegative"; - public static final String ROUND_TOWARDS_ZERO = "roundTowardsZero"; - public static final String FP_ABS = "fp.abs"; - public static final String FP_NEG = "fp.neg"; - public static final String FP_MIN = "fp.min"; - public static final String FP_MAX = "fp.max"; - public static final String FP_REM = "fp.rem"; - public static final String FP_ADD = "fp.add"; - public static final String FP_SUB = "fp.sub"; - public static final String FP_MUL = "fp.mul"; - public static final String FP_DIV = "fp.div"; - public static final String FP_FMA = "fp.fma"; - public static final String FP_SQRT = "fp.sqrt"; - public static final String FP_ROUND_TO_INTEGRAL = "fp.roundToIntegral"; - public static final String FP_LEQ = "fp.leq"; - public static final String FP_LT = "fp.lt"; - public static final String FP_GEQ = "fp.geq"; - public static final String FP_GT = "fp.gt"; - public static final String FP_EQ = "fp.eq"; - public static final String FP_IS_NORMAL = "fp.isNormal"; - public static final String FP_IS_SUBNORMAL = "fp.isSubnormal"; - public static final String FP_IS_ZERO = "fp.isZero"; - public static final String FP_IS_INFINITE = "fp.isInfinite"; - public static final String FP_IS_NAN = "fp.isNaN"; - public static final String FP_IS_NEGATIVE = "fp.isNegative"; - public static final String FP_IS_POSITIVE = "fp.isPositive"; - public static final String FP_TO_REAL = "fp.to_real"; - - // Strings - public static final String STRING = "String"; - public static final String REGLAN = "RegLan"; - - public static final String CHAR = "char"; - - public static final String STR_CONCAT = "str.++"; - public static final String STR_LEN = "str.len"; - public static final String STR_LT = "str.<"; - public static final String STR_TO_RE = "str.to_re"; - public static final String STR_IN_RE = "str.in_re"; - public static final String RE_NONE = "re.none"; - public static final String RE_ALL = "re.all"; - public static final String RE_ALLCHAR = "re.allchar"; - public static final String RE_CONCAT = "re.++"; - public static final String RE_UNION = "re.union"; - public static final String RE_INTER = "re.inter"; - public static final String RE_STAR = "re.*"; - - public static final String STR_LE = "str.<="; - public static final String STR_AT = "str.at"; - public static final String STR_SUBSTR = "str.substr"; - public static final String STR_PREFIXOF = "str.prefixof"; - public static final String STR_SUFFIXOF = "str.suffixof"; - public static final String STR_CONTAINS = "str.contains"; - public static final String STR_INDEXOF = "str.indexof"; - public static final String STR_REPLACE = "str.replace"; - public static final String STR_REPLACE_ALL = "str.replace_all"; - public static final String STR_REPLACE_RE = "str.replace_re"; - public static final String STR_REPLACE_RE_ALL = "str.replace_re_all"; - /** Regex complement */ - public static final String RE_COMP = "re.comp"; - /** Regex difference */ - public static final String RE_DIFF = "re.diff"; - public static final String RE_PLUS = "re.+"; - /** RegEx option: (re_opt re) = (re.union (re.to_str "") re) */ - public static final String RE_OPT = "re.opt"; - public static final String RE_RANGE = "re.range"; - public static final String RE_ITER = "re.^"; - public static final String RE_LOOP = "re.loop"; - - public static final String STR_IS_DIGIT = "str.is_digit"; - public static final String STR_TO_CODE = "str.to_code"; - public static final String STR_FROM_CODE = "str.from_code"; - public static final String STR_TO_INT = "str.to_int"; - public static final String STR_FROM_INT = "str.from_int"; - - // official attributes - public static final String NAMED = ":named"; - public static final String PATTERN = ":pattern"; - - // command reply - public String ERROR = "error"; - public String UNSUPPORTED = "unsupported"; - public String SUCCESS = "success"; - public String SAT = "sat"; - public String UNKNOWN = "unknown"; - public String UNSAT = "unsat"; - - // info keys and their values - public String SMT_LIB_VERSION = ":smt-lib-version"; - public String ERROR_BEHAVIOR = ":error-behavior"; - public String CONTINUED_EXECUTION = "continued-execution"; - public String IMMEDIATE_EXIT = "immediate-exit"; - public String NAME = ":name"; - public String VERSION = ":version"; - public String AUTHORS = ":authors"; - public String STATUS = ":status"; - public String ALL_STATISTICS = ":all-statistics"; - public String REASON_UNKNOWN = ":reason-unknown"; - public String ASSERTION_STACK_LEVELS = ":assertion-stack-levels"; - - // option keys and their values - public String DIAGNOSTIC_OUTPUT_CHANNEL = ":diagnostic-output-channel"; - public String GLOBAL_DECLARATIONS = ":global-declarations"; - public String INTERACTIVE_MODE = ":interactive-mode"; - public String PRINT_SUCCESS = ":print-success"; - public String PRODUCE_ASSERTIONS = ":produce-assertions"; - public String PRODUCE_ASSIGNMENTS = ":produce-assignments"; - public String PRODUCE_MODELS = ":produce-models"; - public String PRODUCE_PROOFS = ":produce-proofs"; - public String PRODUCE_UNSAT_ASSUMPTIONS = ":produce-unsat-assumptions"; - public String PRODUCE_UNSAT_CORES = ":produce-unsat-cores"; - public String RANDOM_SEED = ":random-seed"; - public String REGULAR_OUTPUT_CHANNEL = ":regular-output-channel"; - public String REPRODUCIBLE_RESOURCE_LIMIT = ":reproducible-resource-limit"; - public String VERBOSITY = ":verbosity"; - public String STDOUT = "stdout"; - public String STDERR = "stderr"; -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBException.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBException.java deleted file mode 100644 index 4de8efefce2..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SMTLIBException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -/** - * This is the exception thrown by the script interface when an error occurs. - * This corresponds to the SMTLIB 2 result - * 
(error "msg")
- * For the result unsupported, the standard java exception - * UnsupportedOperationException is used. - * - * This class extends RuntimeException since it should never be thrown if - * the script interface is used correctly. It therefore corresponds to - * other runtime exceptions like IllegalArgumentException. - * - * @author hoenicke - */ -@SuppressWarnings("serial") -public class SMTLIBException extends RuntimeException { - public SMTLIBException(String message) { - super(message); - } - - public SMTLIBException(Throwable cause) { - super(cause); - } - - public SMTLIBException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Script.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Script.java deleted file mode 100644 index 7ab6d02c507..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Script.java +++ /dev/null @@ -1,680 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Map; - -/** - * Basic interface for the interaction with an SMTLIB version 2 compliant - * solver. The interface provides all commands of the SMTLIB version 2 standard - * and some additional commands to create sorts and terms. - * - * Following table summarizes the standard options that should be understood by - * every implementation and gives their types. - * - * - * - * - * - * - * - * - * - * - * - * - * - *
OptionType
:print-successBoolean
:produce-proofsBoolean
:produce-assignmentsBoolean
:produce-modelsBoolean
:regular-output-channelString
:diagnostic-output-channelString
:verbosityInteger
:interactive-modeBoolean
:random-seedBigInteger
:timeoutBigInteger
- * - * @author Jochen Hoenicke, Juergen Christ - */ -public interface Script { - public static final Sort[] EMPTY_SORT_ARRAY = new Sort[0]; - public static final Term[] EMPTY_TERM_ARRAY = new Term[0]; - /** - * A lifted three valued Boolean datatype. Convenience operators for the - * interaction with SMT-solvers written in C are given. - * @author Juergen Christ - */ - public enum LBool { - UNSAT { - @Override - public String toString() { - return "unsat"; - } - }, - UNKNOWN { - @Override - public String toString() { - return "unknown"; - } - }, - SAT { - @Override - public String toString() { - return "sat"; - } - }; - } - /** - * Set the logic for the solver. The logic should be the name of one of the - * elements in the {@link Logics} enumeration. - * @param logic Name of the logic to set. - * @throws UnsupportedOperationException If the logic is not supported by - * the solver. - * @throws SMTLIBException If a logic is already set. - */ - public void setLogic(String logic) - throws UnsupportedOperationException, SMTLIBException; - /** - * Set the logic for the solver. - * @param logic Name of the logic to set. - * @throws UnsupportedOperationException If the logic is not supported by - * the solver. - * @throws SMTLIBException If a logic is already set. - */ - public void setLogic(Logics logic) - throws UnsupportedOperationException, SMTLIBException; - - /** - * Set an option for the solver. At least the options described in the standard should be valid options. - * - * @param opt - * Name of the option. Note that it has to start with a colon ({@code :}). - * @param value - * Value for this option. - * @throws UnsupportedOperationException - * If the option is unsupported. - * @throws SMTLIBException - * In case of type errors. - */ - public void setOption(String opt, Object value) - throws UnsupportedOperationException, SMTLIBException; - - /** - * Set some information for the solver. Note that according to the standard a solver has to return success, but - * ignore the info. - * - * @param info - * Name of the info. Note that it has to start with a colon ({@code :}). - * @param value - * Value for this info. - */ - public void setInfo(String info, Object value); - - /** - * Check if constructor is the Constructor of a Datatype within the Theory. - * - * @param constructor - * The Name of the constructor. - * @return The Constructor or null if it does not exist. - */ - public FunctionSymbol getFunctionSymbol(String constructor); - - /** - * Declare constructors of a datatype. - * - * @param name - * Name of the Constructor. - * @param selectors - * The selectors of the Constructor. - * @param argumentSorts - * The argumentSorts of the Constructor. - * @return The array of constructors. - * @throws SMTLIBException - * if name or selectors contain invalid characters. - */ - public DataType.Constructor constructor(String name, String[] selectors, Sort[] argumentSorts) - throws SMTLIBException; - - /** - * Create a new datatype. - * - * @param typename - * Name of the datatypes. - * @param numParams - * The number of generic arguments for generic datatypes. - * @return The datatype object. - * @throws SMTLIBException - * if typename contains invalid characters. - */ - public DataType datatype(String typename, int numParams) - throws SMTLIBException; - - /** - * Declare new datatypes by setting their constructors. - * - * @param datatype - * @param constrs - * The constructors. - * @throws SMTLIBException - * if any problem occurs, e.g. symbols with same name already declared. - */ - public void declareDatatype(DataType datatype, DataType.Constructor[] constrs) - throws SMTLIBException; - - /** - * Declare new datatypes by setting their constructors. - * - * @param datatypes - * the datatypes to declare. - * @param constrs - * The constructors for each datatype (with {@code constrs.length == datatypes.length}). - * @param sortParams - * The sort parameters for each datatype, the outer array contains null if the datatype is not generic - * ({@code sortParams.length == datatypes.length}). - * @throws SMTLIBException - * if any problem occurs, e.g, symbols with same name already declared, wrong array lengths. - */ - public void declareDatatypes(DataType[] datatypes, DataType.Constructor[][] constrs, Sort[][] sortParams) - throws SMTLIBException; - - /** - * Declare a user-defined sort. - * @param sort The name of the new sort. - * @param arity The arity of the new sort. - * @throws SMTLIBException If no logic is set, the logic does not allow - * user-defined sorts, or a sort with this - * name already exists. - */ - public void declareSort(String sort, int arity) throws SMTLIBException; - /** - * Define an alias of a sort. - * @param sort Name of the alias. - * @param sortParams Sort parameters. - * @param definition Original sort. - * @throws SMTLIBException If no logic is set, the logic does not allow - * user-defined sorts, or a sort with this - * name already exists. - */ - public void defineSort(String sort, Sort[] sortParams, Sort definition) - throws SMTLIBException; - /** - * Declare a function symbol. - * @param fun Name of the function symbol. - * @param paramSorts Sorts of the parameters. - * @param resultSort Sort of the result of an application of this function. - * @throws SMTLIBException If the logic is not set, the logic is not an UF - * logic but the function takes parameters, or a - * function with this name already exists. - */ - public void declareFun(String fun, Sort[] paramSorts, Sort resultSort) - throws SMTLIBException; - /** - * Define an alias of a function symbol. - * @param fun Name of the alias. - * @param params Parameters of the alias. - * @param resultSort Return sort of the alias. - * @param definition Definition of the function alias. - * @throws SMTLIBException If the logic is not set, the logic is not an UF - * logic but the function takes parameters, or a - * function with this name already exists. - */ - public void defineFun(String fun, TermVariable[] params, Sort resultSort, - Term definition) throws SMTLIBException; - /** - * Push some levels onto the assertion stack. - * @param levels The number of levels to push. - * @throws SMTLIBException If logic is not set. - */ - public void push(int levels) throws SMTLIBException; - /** - * Pop some levels from the assertion stack. - * @param levels The number of levels to pop. - * @throws SMTLIBException If not enough stack levels are available. - */ - public void pop(int levels) throws SMTLIBException; - /** - * Assert a Boolean term into the solver. The solver might return a change - * in the state of the logical context. Compliant solvers do not have to do - * a full check here but return {@link LBool#UNKNOWN}. - * @param term The Boolean term to assert. - * @return Possibly an unsatisfiability detected by the solver. - * @throws SMTLIBException If the term is not Boolean or a named term - * matches an already defined function. - */ - public LBool assertTerm(Term term) throws SMTLIBException; - /** - * Check for satisfiability of the current context. - * - * Note that this function should return {@link LBool#UNKNOWN} in case of - * errors. - * @return The result of the check as a lifted Boolean. - * @throws SMTLIBException If the logic is not set. - */ - public LBool checkSat() throws SMTLIBException; - /** - * Check for satisfiability of the current context under additional - * assumptions. - * - * Note that this function should return {@link LBool#UNKNOWN} in case of - * errors. - * @param assumptions Additional assumptions as Boolean constants (nullary - * ApplicationTerms of sort Bool or their negations). - * @return The result of the check as a lifted Boolean. - * @throws SMTLIBException If the logic is not set. - */ - public LBool checkSatAssuming(Term... assumptions) throws SMTLIBException; - /** - * Get all assertions contained in the assertion stack. Note that this - * command is only available in interactive mode. To enable interactive - * mode, call - * {@link #setOption(String, Object) setOption}(":interactive-mode", true). - * @return An array of all asserted terms. - * @throws SMTLIBException If interactive mode is not enabled. - */ - public Term[] getAssertions() throws SMTLIBException; - /** - * Trigger a call to a proof processor. Note that this command is only - * available if proof production is enabled and the last {@link #checkSat()} - * returned {@link LBool#UNSAT}. To enable proof production, call - * {@link #setOption(String, Object) setOption}(":produce-proofs", true). - * @return the proof. This is given as a big smtlib term of the internal - * type {@literal @proof}. - * @throws SMTLIBException If proof production is not enabled or the solver - * did not detect unsatisfiability. - * @throws UnsupportedOperationException If proof generation is unsupported. - */ - public Term getProof() - throws SMTLIBException, UnsupportedOperationException; - /** - * Get the unsat core. Note that this command is only available if unsat - * core production is enabled and the last {@link #checkSat()} returned - * {@link LBool#UNSAT}. To enable unsat core production, call - * {@link #setOption(String, Object) setOption}(":produce-unsat-cores", - * true). - * @return An array of terms forming an unsat core. - * @throws SMTLIBException If proof production is not enabled or the solver - * did not detect unsatisfiability. - * @throws UnsupportedOperationException If unsat core computation is - * unsupported. - */ - public Term[] getUnsatCore() - throws SMTLIBException, UnsupportedOperationException; - /** - * Get the unsatisfiable assumptions. Note that this command is only - * available if unsat assumption production is enabled and the last - * {@link #checkSatAssuming(Term...)} returned - * {@link LBool#UNSAT}. To enable unsat assumption production, call - * {@link #setOption(String, Object) setOption} - * (":produce-unsat-assumptions", true). - * @return An array of terms that correspond to an unsatisfiable subset of - * last assumptions. - * @throws SMTLIBException If unsat assumption production is not enabled or - * the solver did not detect unsatisfiability. - * @throws UnsupportedOperationException If unsat assumption computation is - * unsupported. - */ - public Term[] getUnsatAssumptions() - throws SMTLIBException, UnsupportedOperationException; - /** - * Get values for some terms in the model. Note that this command is only - * available if model production is enabled and the last {@link #checkSat()} - * did not return {@link LBool#UNSAT}. To enable model production, call - * {@link #setOption(String, Object) setOption}(":produce-models", true). - * @param terms an array of terms whose value should be computed. - * @return A valuation (mapping from term to value (which is again - * represented by a term) where the keys are the given terms. - * @throws SMTLIBException If model production is not enabled or the solver - * detected unsatisfiability. - * @throws UnsupportedOperationException If model computation is - * unsupported - */ - public Map getValue(Term[] terms) - throws SMTLIBException, UnsupportedOperationException; - /** - * Get values for all named boolean terms in the model. Note that this - * command is only available if assignment production is enabled and the - * last {@link #checkSat()} did not return {@link LBool#UNSAT}. To - * enable assignment production, call - * {@link #setOption(String, Object) setOption}(":produce-assignments", - * true). - * @return An {@link Assignments}. - * @throws SMTLIBException If assignment production is not enabled, or the - * solver did not detect unsatisfiability. - * @throws UnsupportedOperationException If model computation is - * unsupported - */ - public Assignments getAssignment() - throws SMTLIBException, UnsupportedOperationException; - /** - * Get the value of an option. - * @param opt Name of an option. - * @return The value of this option. - * @throws UnsupportedOperationException If option is unsupported. - */ - public Object getOption(String opt) throws UnsupportedOperationException; - - /** - * Get information from the solver. Note that the solver only has to implement the info values described in the - * standard. - * - * @param info - * Name of the info. Note that it has to start with a colon ({@code :}). - * @return Value of the option. - * @throws UnsupportedOperationException - * If the info is unsupported. - * @throws SMTLIBException - * If info is :reason-unknown but last check did not return unknown. - */ - public Object getInfo(String info) - throws UnsupportedOperationException, SMTLIBException; - /** - * Exit the solver. - */ - public void exit(); - - /* Term creation */ - /** - * Constant representing universal quantification. - */ - public static final int FORALL = QuantifiedFormula.FORALL; - /** - * Constant representing existential quantification. - */ - public static final int EXISTS = QuantifiedFormula.EXISTS; - - /** - * Get the theory that is used to maintain the term database and list of - * declared and defined functions. - * - * @return the theory. - */ - public Theory getTheory(); - - /** - * Instantiate an n-ary sort with parameters. - * @param sortname Name of the sort. - * @param params Sort parameters. - * @return The corresponding sort. - * @throws SMTLIBException If and only if the sort does not exist. - */ - public Sort sort(String sortname, Sort... params) throws SMTLIBException; - /** - * Instantiate an indexed n-ary sort with parameters. - * @param sortname Name of the sort. - * @param indices Sort indices. - * @param params Sort parameters. - * @return The corresponding sort. - * @throws SMTLIBException If and only if the sort does not exist. - */ - public Sort sort(String sortname, String[] indices, Sort... params) - throws SMTLIBException; - /** - * Create an array of sort parameters. These parameters can be used when - * defining a sort. Note that these names cannot be used in the sort - * functions since the result does not contain any real sort. Users have - * to save the array and use its components. The result contains the - * variables in the order in which the names are specified in the input. - * @param names The names of the variables - * @return An array corresponding to sort variables with the given names. - * @throws SMTLIBException If an error occured. - */ - public Sort[] sortVariables(String... names) throws SMTLIBException; - /** - * Create an n-ary term by name. This function should also be used to - * construct Boolean terms. I.e., the function names "and", "or", "=>", - * "ite", "=", "distinct", or "not" might be used to create formulas. - * @param funcname Name of the function. - * @param params The parameters of the function application. - * @return The constructed term. - * @throws SMTLIBException If an error occurred. - */ - public Term term(String funcname, Term... params) throws SMTLIBException; - /** - * Create an n-ary term by name, indices and return sort. This term - * constructor can be used to resolve overloaded function symbols, or create - * applications of the "as" function. - * @param funcname Name of the function. - * @param indices Indices for the function. - * @param returnSort Return sort of the function. - * @param params The parameters of the function application. - * @return The constructed term. - * @throws SMTLIBException If an error occurred. - */ - public Term term(String funcname, String[] indices, - Sort returnSort, Term... params) throws SMTLIBException; - /** - * Create a term variable. - * @param varname Name of the variable. - * @param sort Sort of the variable. - * @return The term variable. - * @throws SMTLIBException If no name or an invalid sort is given. - */ - public TermVariable variable(String varname, Sort sort) - throws SMTLIBException; - /** - * Create a quantified formula. - * @param quantor The quantor flag (one of {@link #EXISTS}, or - * {@link #FORALL}) - * @param vars The quantified variables. - * @param body The body of the quantified formula. - * @param patterns Possible patterns for e-matching (may be - * null). - * @return The quantified formula. - * @throws SMTLIBException If an error occurred. - */ - public Term quantifier(int quantor, TermVariable[] vars, Term body, - Term[]... patterns) throws SMTLIBException; - /** - * Create a let term. Note that you have to provide exactly as many - * variables as you provide values. - * @param vars Variables bound by a let. - * @param values Values for these variables. - * @param body Body of the let term. - * @return The let term. - * @throws SMTLIBException If an error occurred. - */ - public Term let(TermVariable[] vars, Term[] values, Term body) - throws SMTLIBException; - - /** - * Create a match term. - * - * @param dataArg - * The term that is to be matched. - * @param vars - * The variables of each pattern. - * @param cases - * The match cases. - * @return The match term. - * @throws SMTLIBException - * if a problem occurs (with a human readable description). - */ - public Term match(final Term dataArg, final TermVariable[][] vars, final Term[] cases, - DataType.Constructor[] constructors) throws SMTLIBException; - /** - * Annotate a term. This can be used to create named terms. - * @param t Term to annotate. - * @param annotations Annotations for this term. - * @return The annotated term. - * @throws SMTLIBException If the annotation is invalid, or the evaluation - * of :named produces an error. - */ - public Term annotate(Term t, Annotation... annotations) - throws SMTLIBException; - /** - * Create a numeral term. - * @param num String representation of the numeral. - * @return A numeral term. - * @throws SMTLIBException If an error occurred. - */ - public Term numeral(String num) throws SMTLIBException; - /** - * Create a numeral term. - * @param num the numeral as a big integer. - * @return A numeral term. - * @throws SMTLIBException If an error occurred. - */ - public Term numeral(BigInteger num) throws SMTLIBException; - /** - * Create a decimal term. - * @param decimal String representation of the decimal. - * @return A decimal term. - */ - public Term decimal(String decimal) throws SMTLIBException; - /** - * Create a decimal term. - * @param decimal the decimal as a big decimal. - * @return A decimal term. - */ - public Term decimal(BigDecimal decimal) throws SMTLIBException; - /** - * Create a hexadecimal term. - * @param hex String representation of the hexadecimal. - * @return A hexadecimal term. - * @throws SMTLIBException If an error occurred. - */ - public Term hexadecimal(String hex) throws SMTLIBException; - /** - * Create a binary term. - * @param bin String representation of the binary. - * @return A binary term. - * @throws SMTLIBException If an error occurred. - */ - public Term binary(String bin) throws SMTLIBException; - /** - * Create a string term. - * @param str The string constant (as quoted object). - * @return A string term. - * @throws SMTLIBException If an error occurred. - */ - public Term string(QuotedObject str) throws SMTLIBException; - - /* Non-SMTLIB extensions */ - /** - * Return the underlying theory. This theory is only valid after a call to - * setLogic and before a call to restart. - * @return The underlying theory - */ -// public Theory getTheory(); - /** - * Simplify a term. This returns a term that is under the current - * assertions equivalent to the input term. - * @param term A (usually Boolean) term to simplify. - * @return The simplified term. - * @throws SMTLIBException If an error occurred or unsupported. - */ - public Term simplify(Term term) throws SMTLIBException; - /** - * Reset the solver completely. Note that this invalidates all objects - * previously returned and unsets the logic. - */ - public void reset(); - /** - * Resets the assertion stack. This option will keep the logic and all - * globally defined symbols. - */ - public void resetAssertions(); - /** - * Get interpolants for the partitions. Note that the arguments to this - * call must either be the names of Boolean top-level assertions, or the - * conjunction of such names. - * @param partition Partitioning of the assertion stack. - * @return Interpolants. - * @throws SMTLIBException An error occurred. - * @throws UnsupportedOperationException If interpolant computation is - * unsupported. - */ - public Term[] getInterpolants(Term[] partition) - throws SMTLIBException, UnsupportedOperationException; - - /** - * Compute a sequence of interpolants. The nesting array describes the start of - * the subtree for tree interpolants. For inductive sequences of interpolants - * use a nesting array completely filled with 0. - * - * @param partition The array of formulas. This should contain either - * top-level names or conjunction of top-level names. - * @param startOfSubtree The start of the subtree containing the formula at this - * index as root. - * @return Tree interpolants respecting the nesting relation. - * @throws SMTLIBException An error occurred. - * @throws UnsupportedOperationException If interpolant computation is - * unsupported. - */ - public Term[] getInterpolants(Term[] partition, int[] startOfSubtree) - throws SMTLIBException, UnsupportedOperationException; - - /** - * Compute a sequence of interpolants. The nesting array describes the start of - * the subtree for tree interpolants. For inductive sequences of interpolants - * use a nesting array completely filled with 0. This computes the interpolants - * from the given proof. It can be called at any time, even if the assertion - * stack has been modified since computing the proof. - * - * @param partition The array of formulas. This should contain either - * top-level names or conjunction of top-level names. - * @param startOfSubtree The start of the subtree containing the formula at this - * index as root. - * @param proofTree The proof tree that used to compute interpolants. - * @return Tree interpolants respecting the nesting relation. - * @throws SMTLIBException An error occurred. - * @throws UnsupportedOperationException If interpolant computation is - * unsupported. - */ - public Term[] getInterpolants(Term[] partition, int[] startOfSubtree, Term proofTree) - throws SMTLIBException, UnsupportedOperationException; - /** - * Retrieve a complete model from the solver. This is an optional (non- - * SMTLIB compliant) operation. This function can only be called when the - * previous {@link #checkSat()} returned {@link LBool#SAT} or (optionally) - * {@link LBool#UNKNOWN} and no assertion stack command was issued after - * this check. - * @return A model for the current formula. - * @throws SMTLIBException - * Model production was not enabled. - * @throws UnsupportedOperationException - * The solver does not support this operation. - */ - public Model getModel() - throws SMTLIBException, UnsupportedOperationException; - /** - * Perform an AllSAT computation over some important predicates. - * @param predicates The important predicates. Must be Boolean. - * @return Iterator over minterms found during iteration. - * @throws SMTLIBException If a predicate is non-Boolean. - * @throws UnsupportedOperationException If the operation is unsupported. - */ - public Iterable checkAllsat(Term[] predicates) - throws SMTLIBException, UnsupportedOperationException; - /** - * Try to find an equality between x and y that - * is implied in the current satisfiable context. If successful, this - * method returns an array of parameters a,b,c such that the - * equality a*x = b*y + c is implied by the current context. - * Note that the x array and the y array must be - * of equal length and of length at least 2. - * @param x The different incarnations of the lhs variable. - * @param y The different incarnations of the rhs variable. - * @return Array of length 3 or array of length 0 if no equality is implied. - */ - public Term[] findImpliedEquality(Term[] x, Term[] y); - /** - * Echo a message on the regular output channel of the solver. Although - * this function is not specified in the SMTLIB standard, we do not expect - * implementations to throw any exceptions. Instead, if the command is - * unsupported, it should simply be implemented as the identity function. - * @param msg The message to print. - * @return The message. - */ - public QuotedObject echo(QuotedObject msg); -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Sort.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Sort.java deleted file mode 100644 index 5a535915197..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Sort.java +++ /dev/null @@ -1,360 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -import java.util.HashMap; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; - -/** - * Represents an SMTLIB sort. We distinguish real sorts (which - * are declared with declare-sort or pre-defined in the logic) from - * defined sort (which are defined with define-sort to some other sort. - * For a real sort, getRealSort() == this holds. - * - * A sort has a sort symbol and as many sort arguments as the sort symbol - * specifies. There are also parametric sorts used for declaring polymorphic - * function symbols. A parametric sort (or sort variable) has a position - * (used for substitution) and a name, both stored in the SortSymbol. - * - * Every term has a closed real sort, which can be obtained by term.getSort(). - * Defined sorts may occur only in function symbols and the declared sort of - * a term variable. Sorts that are not closed may only occur in polymorphic - * function symbols and in sort definitions in SortSymbol. - * - * @author Jochen Hoenicke - */ -public final class Sort { - /** - * The sort symbol. - */ - final SortSymbol mSymbol; - /** - * The arguments of the sort symbol. This is null if the sort symbol - * has no arguments, otherwise it is an array with mSymbol.mnumParams - * elements. - */ - final Sort[] mArgs; - /** - * The indices of the sort symbol. For the sort BitVec this is an - * array with one element containing the bit length. This field is - * null (instead of the empty array) if there are no indices. - */ - final String[] mIndices; - /** - * The cached real sort. This is null if real sort was not yet computed. - * Otherwise it is this for a real sort and the real sort as which the - * sort is defined in all other cases. - */ - //@ invariant mRealSort == null || mRealSort.getRealSort() == mRealSort - Sort mRealSort; - - private int mHash; - - Sort(final SortSymbol sym, final String[] indices, final Sort[] args) { - assert args != null; - assert args.length == (sym.isSortVariable() ? 0 : sym.mNumParams) - : "Sort created with wrong number of args"; - mSymbol = sym; - mIndices = indices; - mArgs = args; - mHash = HashUtils.hashJenkins(mSymbol.hashCode(), (Object[]) mArgs); - if (mIndices != null) { - mHash = HashUtils.hashJenkins(mHash, (Object[]) mIndices); - } - } - - /** - * Get the name of this sort. - * @return the name. - */ - public String getName() { - return mSymbol.getName(); - } - - /** - * Get the indexed name of this sort in smtlib representation. - * @return the name. - */ - public String getIndexedName() { - final String name = PrintTerm.quoteIdentifier(mSymbol.getName()); - if (mIndices == null) { - return name; - } - final StringBuilder sb = new StringBuilder(); - sb.append("(_ ").append(name); - for (final String i : mIndices) { - sb.append(' ').append(i); - } - sb.append(')'); - return sb.toString(); - } - - /** - * Get the symbol for the sort constructor. - * - * @return the sort symbol - */ - public SortSymbol getSortSymbol() { - return mSymbol; - } - - /** - * Get the indices, if this is an indexed sort like (_ bv 5). - * @return the indices, null if this sort is not indexed. - */ - public String[] getIndices() { - return mIndices; - } - - /** - * Get the sort arguments for a sort. This is used for a sort, whose - * sort symbol was declared with - * {@link Script#declareSort(String, int) declare-sort(name, int)} - * where the second parameter is not zero. In that case the sort is created - * with sort arguments and these arguments are returned by this method. - * @return An array containing the sort arguments for this sort. - * You must never write to this array. - */ - public Sort[] getArguments() { - return mArgs; - } - - /** - * Get the real sort. This is used for sorts that are defined with - * {@link Script#defineSort(String, Sort[], Sort) define-sort}. - * For other sorts this just returns this. - * @return the sort representation where all sort definitions are expanded. - */ - public Sort getRealSort() { - if (mRealSort == null) { - if (mSymbol.mSortDefinition == null) { - if (mArgs.length == 0) { - mRealSort = this; - } else { - Sort[] newArgs = mArgs; - for (int i = 0; i < newArgs.length; i++) { - final Sort realArg = mArgs[i].getRealSort(); - if (realArg != mArgs[i]) { - if (newArgs == mArgs) { - newArgs = mArgs.clone(); - } - newArgs[i] = realArg; - } - } - if (newArgs == mArgs) { - mRealSort = this; - } else { - mRealSort = - mSymbol.getSort(mIndices, newArgs).getRealSort(); - } - } - } else { - mRealSort = - mSymbol.mSortDefinition.mapSort(mArgs).getRealSort(); - } - } - return mRealSort; - } - - boolean equalsSort(final Sort other) { - if (this == other) { - return true; - } - return getRealSort() == other.getRealSort(); - } - - /** - * Unify this sort with a concrete sort. - * - * @param unifier The unifier map. It serves as map from sort parameters - * to substituted sorts, and also as cache for all open sorts. It should - * contain all previously computed substitutions. - * @param concrete the concrete sort to unify this sort with. - * It must be closed and real. - * @return true if the sorts unify (in which case the unifier is extended) - * or false otherwise. - */ - boolean unifySort(final HashMap unifier, final Sort concrete) { - assert concrete.getRealSort() == concrete; - final Sort last = unifier.get(this); - if (last != null) { - return last == concrete; - } - - if (!mSymbol.isSortVariable()) { - final Sort me = getRealSort(); - if (me.mSymbol != concrete.mSymbol) { - return false; - } - - for (int i = 0; i < me.mArgs.length; i++) { - if (!me.mArgs[i].unifySort(unifier, concrete.mArgs[i])) { - return false; - } - } - } - unifier.put(this, concrete); - return true; - } - - /** - * Substitute this sort. - * - * @param substitution The substitution. Note that every sort variable has - * a unique position which is used as index in the substitution array. - * @return The substituted sort. - */ - public Sort mapSort(final Sort[] substitution) { - if (mSymbol.isSortVariable()) { - return substitution[mSymbol.mNumParams]; - } - if (mArgs.length == 0) { - return this; - } - if (mArgs.length == 1) { - final Sort arg = mArgs[0].mapSort(substitution); - return mSymbol.getSort(mIndices, new Sort[] { arg }); - } - - // For more than two arguments create a cache to avoid exponential blow - final HashMap cachedMappings = new HashMap(); - return mapSort(substitution, cachedMappings); - } - - /** - * Substitute this sort. - * - * @param substitution The substitution. Note that every sort variable has - * a unique position which is used as index in the substitution array. - * @param cachedMappings A cache storing for each visited sort the - * corresponding substituted sort. - * @return The substituted sort. - */ - Sort mapSort(final Sort[] substitution, final HashMap cachedMappings) { - if (mSymbol.isSortVariable()) { - return substitution[mSymbol.mNumParams]; - } - Sort result = cachedMappings.get(this); - if (result != null) { - return result; - } - if (mArgs.length == 0) { - result = this; - } else { - final Sort[] newArgs = new Sort[mArgs.length]; - for (int i = 0; i < mArgs.length; i++) { - newArgs[i] = mArgs[i].mapSort(substitution, cachedMappings); - } - result = mSymbol.getSort(mIndices, newArgs); - } - cachedMappings.put(this, result); - return result; - } - - /** - * This returns true if and only if the sort was created with - * {@link Script#sortVariables(String...)}. These are only used for a - * later {@link Script#defineSort(String, Sort[], Sort) define-sort} - * command. - * @return true iff this is a sort variable. - */ - public boolean isSortVariable() { - return mSymbol.isSortVariable(); - } - - /** - * This returns the SMTLIB string represenation of this sort. - * @return the SMTLIB string representation. - */ - @Override - public String toString() { - if (mArgs.length == 0) { - return getIndexedName(); - } - final StringBuilder sb = new StringBuilder(); - new PrintTerm().append(sb, this); - return sb.toString(); - } - - /** - * Convert a sort to a string in a stack based fashion. - * @param mTodo The stack where to put the strings and sub sorts. - * @see PrintTerm - */ - void toStringHelper(final ArrayDeque mTodo) { - final String name = getIndexedName(); - final Sort[] args = getArguments(); - if (args.length == 0) { - mTodo.addLast(name); - } else { - mTodo.addLast(")"); - for (int i = args.length - 1; i >= 0; i--) { - mTodo.addLast(args[i]); - mTodo.addLast(" "); - } - mTodo.addLast(name); - mTodo.addLast("("); - } - } - - public Theory getTheory() { - return mSymbol.mTheory; - } - - /** - * Returns true if this is an array sort. This is any instantiation - * of the parametric sort Array defined by the SMTLIB array theory. - * @return true if this is an array sort. - */ - public boolean isArraySort() { - return getRealSort().mSymbol.isArray(); - } - - /** - * @return true if this is a bit-vector sort. - */ - public boolean isBitVecSort() { - return getName().equals("BitVec"); - } - - /** - * Returns true if this is a numeric sort. Numeric sorts are only the - * sorts Int and Real defined by the corresponding SMTLIB theories. - * @return true if this is a numeric sort. - */ - public boolean isNumericSort() { - return getRealSort().mSymbol.isNumeric(); - } - - /** - * Returns true if this sort is internal, i.e., defined by an SMTLIB - * theory. - * @return true if the sort is internal, false if it is user defined. - */ - public boolean isInternal() { - return mSymbol.isIntern(); - } - - @Override - public int hashCode() { - return mHash; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SortSymbol.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SortSymbol.java deleted file mode 100644 index ab629328e8e..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/SortSymbol.java +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.Arrays; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.UnifyHash; - -/** - * A sort symbol is the name of an SMTLIB sort. In SMTLIB, sorts can be - * parametric over other sorts, e.g., the array sort - * Array IndexSort ElemSort is parametric over the index and - * element sort. The sort symbol represents only the name, i.e., Array and - * stores the number of sort parameters. Then several objects of type Sort - * can be instantiated with different sort parameters. - * - * @author Jochen Hoenicke - */ -public class SortSymbol { - /** - * Flag to indicate that this is an internal sort symbol. An internal - * sort is one, that is defined by the theory, i.e., Bool, Int, Real, - * BitVec, Array. - */ - static final int INTERNAL = 1; - /** - * Flag to indicate that this sort is really a sort variable. Sort - * variables are only used in sort definitions. Outside of these every - * sort should not contain any sort variable. - */ - static final int TYPEPARAM = 2; - /** - * Flag to indicate that this sort expects index parameter. The only - * such sort is currently BitVec. - */ - static final int INDEXED = 4; - /** - * Flag to indicate numeric types. - */ - static final int NUMERIC = 8; - /** - * Flag to indicate array types. - */ - static final int ARRAY = 0x10; - /** - * Flag to indicate data types. - */ - static final int DATATYPE = 0x20; - /** - * Flag to indicate the function types. - */ - static final int FUNCTION = 0x40; - - final Theory mTheory; - final String mName; - /** - * The number of parameters this sort symbol expects. If the TYPEPARAM - * flag is set, this sort is a sort variable and takes no parameters; in - * that case this gives the de-Bruijn-index of the sort variable. - */ - final int mNumParams; - /** - * The flags. This is the bitwise or of INTERNAL, TYPEPARAM and - * INDEXED. - */ - final int mFlags; - /** - * The sorts already created from this SortSymbol. - * If mNumParams is 0, this is the single sort corresponding to - * this SortSymbol. Otherwise this is a UnifyHash containing all - * created sorts. - */ - final Object mSorts; - - /** - * The primitive sort if this is a sort definition. - */ - final Sort mSortDefinition; - - /** - * The constructor for sort symbols. - * @param theory The theory this sort belongs to. - * @param name The name of the sort (without enclosing | for quoting). - * @param numParams The number of sort parameters this sort expects. - * E.g., Array expects two sort parameters for index and - * element sort. For sort variables this gives the - * de-Bruijn index of the variable instead. - * @param definition The sort definition, or null if this is a fresh sort. - * @param flags The flags; bitwise or of INTERNAL, TYPEPARAM and INDEXED. - */ - SortSymbol(Theory theory, String name, int numParams, - Sort definition, int flags) { - mTheory = theory; - mName = name; - mFlags = flags; - mNumParams = numParams; - mSortDefinition = definition; - if ((mFlags & TYPEPARAM) != 0 - || ((mFlags & INDEXED) == 0 && mNumParams == 0)) { - mSorts = new Sort(this, null, new Sort[0]); - } else { - mSorts = new UnifyHash(); - } - } - - /** - * Checks if the sort is internal, i.e., defined by the logic. - * @return true, if the sort is an internal sort. - */ - public boolean isIntern() { - return (mFlags & INTERNAL) != 0; - } - - /** - * Returns the name of this sort. The | symbols used for quoting are - * not part of the name. - * @return the name of the sort. - */ - public String getName() { - return mName; - } - - /** - * Returns a string representation of the sort symbol, as it would be - * used for declare-sort command. - * @return the string representation. - */ - @Override - public String toString() { - return "(" + PrintTerm.quoteIdentifier(mName) + " " + mNumParams + ")"; - } - - /** - * Checks whether the indices and the arity match and the sort can be - * created. This function is called when a sort expression is parsed. - * Override this function if your sort expects indices. - * @param indices The indices. - * @param arity The number of sort parameters. - * @throws IllegalArgumentException if the sort parameters or the index - * do not match. - */ - public void checkArity(String[] indices, int arity) { - if (indices != null) { - throw new IllegalArgumentException( - "Indexed Sort " + mName + " undefined"); - } - if (arity != ((mFlags & TYPEPARAM) == 0 ? mNumParams : 0)) { - throw new IllegalArgumentException( - "Wrong number of arguments for sort " + mName); - } - } - - @SuppressWarnings("unchecked") - /** - * Create the sort with the given indices and sort parameters. Sorts are - * unified, so this will return an instance of a previously created sort - * if it already exists. - * @param indices The indices of the sort, which are given by - * (_ sortname indices). This is null if no indices were - * used. - * @param args The sort parameters; the empty array if no parameters were - * used. - * @return the created sort. - * @throws IllegalArgumentException if the indices or number of sort - * parameters do not match. - */ - public Sort getSort(String[] indices, Sort... args) { - checkArity(indices, args.length); - if ((mFlags & INDEXED) == 0 && args.length == 0) { - return (Sort) mSorts; - } - final UnifyHash sortCache = (UnifyHash) mSorts; - final int hash = Arrays.hashCode(indices) ^ Arrays.hashCode(args); - for (final Sort sort : sortCache.iterateHashCode(hash)) { - if (Arrays.equals(sort.getArguments(), args) - && Arrays.equals(sort.getIndices(), indices)) { - return sort; - } - } - final Sort sort = new Sort(this, indices, args); - sortCache.put(hash, sort); - return sort; - } - - /** - * Checks if this is a sort variable. - * @return true if this is a sort variable. - */ - public boolean isSortVariable() { - return (mFlags & TYPEPARAM) != 0; - } - /** - * Check if this sort symbol corresponds to a numeric sort. - * @return true if this sort is numeric. - */ - public boolean isNumeric() { - return (mFlags & NUMERIC) != 0; - } - - /** - * Check if this sort symbol corresponds to an array sort. - * @return true if this sort is an array sort. - */ - public boolean isArray() { - return (mFlags & ARRAY) != 0; - } - - /** - * Check if this sort symbol is a datatype. - * - * @return true if this sort symbol is a datatype. - */ - public boolean isDatatype() { - return (mFlags & DATATYPE) != 0; - } - - /** - * Check if this sort symbol is a function type, i.e. the sort symbol - * {@code ->}. - * - * @return true if this sort symbol is a function type. - */ - public boolean isFunction() { - return (mFlags & FUNCTION) != 0; - } - - @Override - public int hashCode() { - return mName.hashCode(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Term.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Term.java deleted file mode 100644 index d70b696a450..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Term.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 2009-2022 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; - -/** - * This is the base class for representing SMTLIB 2 terms. You can assume that - * every term is one of the following sub-classes: - *
    - *
  • {@link ApplicationTerm} represents a function application - * (name ...).
    • - *
  • {@link AnnotatedTerm} represents an annotated term - * (! term ...).
    • - *
  • {@link ConstantTerm} represents a numeral, decimal, bit vector, or string - * literal.
    • - *
  • {@link LambdaTerm} represents a lambda term - * (lambda ((var sort)...) term).
    • - *
  • {@link LetTerm} represents a let term - * (let ((var term)...) term).
    • - *
  • {@link MatchTerm} represents a datatype match term - * (match d (cases...)).
    • - *
  • {@link TermVariable} represents a term variable var used in - * quantifier or let term. Note that constants are represented by - * ApplicationTerm.
    • - *
  • {@link QuantifiedFormula} represents a quantified formula - * (exists/forall ...).
    • - *
- * - * In principle it is possible to write your own sub-classes, but that is - * dangerous and only recommend for the advanced SMTInterpol hacker. - * - * @author Juergen Christ, Jochen Hoenicke - */ -public abstract class Term { - private final int mHash; - - /** - * A temporary counter used e.g. to count the number of occurrences of this - * term in a bigger term. - * Don't use this!!!! - */ - public int mTmpCtr; - - TermVariable[] mFreeVars; - - /** - * Create a term. - * @param hash the hash code of the term. This should be stable. - */ - protected Term(final int hash) { - mHash = hash; - } - - /** - * Returns the SMTLIB sort of this term. - * @return the sort of the term. - */ - public abstract Sort getSort(); - - /** - * Computes and returns the free variables occurring in this term. - * @return the free variables. - */ - public TermVariable[] getFreeVars() { - if (mFreeVars == null) { - new ComputeFreeVariables().transform(this); - } - return mFreeVars; - } - - public Theory getTheory() { - return getSort().mSymbol.mTheory; - } - - /** - * Prints an SMTLIB representation of this term. This - * {@link FormulaLet introduces lets for common subexpressions} - * to prevent exponential blow-up when printing - * a term with lots of sharing. - * @return an SMTLIB representation. - */ - @Override - public String toString() { - final Term letted = new FormulaLet().let(this); - return letted.toStringDirect(); - } - - /** - * Prints the canonical SMTLIB representation of this term. - * This does not eliminate common sub-expressions and can cause - * exponential blow-up. - * @return the canonical SMTLIB representation. - */ - public String toStringDirect() { - final StringBuilder sb = new StringBuilder(); - new PrintTerm().append(sb, this); - return sb.toString(); - } - - @Override - public int hashCode() { - return mHash; - } - - /** - * Convert a term to a string in a stack based fashion. This is used - * for internal purposes. External users can just use toString() - * or toStringDirect(). - * @param mTodo The stack where to put the strings and sub terms. - * @see PrintTerm - */ - protected abstract void toStringHelper(ArrayDeque mTodo); -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermEquivalence.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermEquivalence.java deleted file mode 100644 index 521405fbf2c..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermEquivalence.java +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 2013 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.ScopedHashMap; - -/** - * This class checks if two terms are syntactically equivalent modulo renaming of variables. E. g., - * (let ((x 0)) x) is equivalent to (let ((y 0)) y), but not to 0 or - * (let ((y 0)) 0). - * - * @author Juergen Christ, Jochen Hoenicke - */ -public class TermEquivalence extends NonRecursive { - - private final ScopedHashMap mRenaming = - new ScopedHashMap(); - - private void beginScope() { - mRenaming.beginScope(); - } - - private void endScope() { - mRenaming.endScope(); - } - - private void addRenaming(TermVariable lvar, TermVariable rvar) { - mRenaming.put(lvar, rvar); - } - - private boolean checkRenaming(TermVariable lvar, TermVariable rvar) { - return mRenaming.get(lvar) == rvar; - } - - @SuppressWarnings("serial") - private static final class NotEq extends RuntimeException { - // Empty control flow exception - } - - private final static class EndScope implements Walker { - public final static EndScope INSTANCE = new EndScope(); - @Override - public void walk(NonRecursive engine) { - final TermEquivalence te = (TermEquivalence) engine; - te.endScope(); - } - } - - private final static class AddRenaming implements Walker { - private final TermVariable mLvar, mRvar; - public AddRenaming(TermVariable lvar, TermVariable rvar) { - mLvar = lvar; - mRvar = rvar; - } - @Override - public void walk(NonRecursive engine) { - final TermEquivalence te = (TermEquivalence) engine; - te.addRenaming(mLvar, mRvar); - } - } - - private final static class TermEq implements Walker { - - private final Term mLhs, mRhs; - - public TermEq(Term lhs, Term rhs) { - mLhs = lhs; - mRhs = rhs; - } - - private final void notEqual() { - throw new NotEq(); - } - - @Override - public void walk(NonRecursive engine) { - final TermEquivalence te = (TermEquivalence) engine; - if (mLhs != mRhs) { - if (mLhs.getClass() != mRhs.getClass()) { - // Cannot be equal - notEqual(); - } - if (mLhs instanceof ApplicationTerm) { - final ApplicationTerm l = (ApplicationTerm) mLhs; - final ApplicationTerm r = (ApplicationTerm) mRhs; - if (l.getFunction() != r.getFunction()) { - notEqual(); - } - final Term[] lparams = l.getParameters(); - final Term[] rparams = r.getParameters(); - if (lparams.length != rparams.length) { - notEqual(); - } - for (int i = 0; i < lparams.length; ++i) { - te.enqueueWalker(new TermEq(lparams[i], rparams[i])); - } - } else if (mLhs instanceof AnnotatedTerm) { - final AnnotatedTerm l = (AnnotatedTerm) mLhs; - final AnnotatedTerm r = (AnnotatedTerm) mRhs; - final Annotation[] lannot = l.getAnnotations(); - final Annotation[] rannot = r.getAnnotations(); - if (rannot.length != lannot.length) { - notEqual(); - } - for (int i = 0; i < lannot.length; ++i) { - if (!lannot[i].getKey().equals(rannot[i].getKey())) { - notEqual(); - } - if (lannot[i].getValue() instanceof Term - && rannot[i].getValue() instanceof Term) { - te.enqueueWalker(new TermEq( - (Term) lannot[i].getValue(), - (Term) rannot[i].getValue())); - } else if (lannot[i].getValue() instanceof Object[] - && rannot[i].getValue() instanceof Object[]) { - te.enqueueWalker( - new ArrayEq((Object[]) lannot[i].getValue(), (Object[]) rannot[i].getValue())); - } else if (lannot[i].getValue() != rannot[i].getValue() && (lannot[i].getValue() == null - || !lannot[i].getValue().equals(rannot[i].getValue()))) { - notEqual(); - } - } - } else if (mLhs instanceof LetTerm) { - final LetTerm llet = (LetTerm) mLhs; - final LetTerm rlet = (LetTerm) mRhs; - final TermVariable[] lvars = llet.getVariables(); - final TermVariable[] rvars = rlet.getVariables(); - if (lvars.length != rvars.length) { - notEqual(); - } - te.enqueueWalker(EndScope.INSTANCE); - te.enqueueWalker(new TermEq(llet.getSubTerm(), rlet.getSubTerm())); - final Term[] lvals = llet.getValues(); - final Term[] rvals = rlet.getValues(); - for (int i = 0; i < lvars.length; ++i) { - te.enqueueWalker(new AddRenaming(lvars[i], rvars[i])); - te.enqueueWalker(new TermEq(lvals[i], rvals[i])); - } - // te.enqueueWalker(BeginScope.INSTANCE); - te.beginScope(); - } else if (mLhs instanceof QuantifiedFormula) { - final QuantifiedFormula lq = (QuantifiedFormula) mLhs; - final QuantifiedFormula rq = (QuantifiedFormula) mRhs; - if (lq.getQuantifier() != rq.getQuantifier()) { - notEqual(); - } - final TermVariable[] lv = lq.getVariables(); - final TermVariable[] rv = rq.getVariables(); - if (lv.length != rv.length) { - notEqual(); - } - te.enqueueWalker(EndScope.INSTANCE); - te.beginScope(); - for (int i = 0; i < lv.length; ++i) { - if (lv[i] != rv[i]) { - if (lv[i].getSort() != rv[i].getSort()) { - notEqual(); - } - te.addRenaming(lv[i], rv[i]); - } - } - te.enqueueWalker(new TermEq(lq.getSubformula(), rq.getSubformula())); - } else if (mLhs instanceof TermVariable) { - final TermVariable lv = (TermVariable) mLhs; - final TermVariable rv = (TermVariable) mRhs; - if (!te.checkRenaming(lv, rv)) { - notEqual(); - } - } // Term case switch - } - } - } - - private final static class ArrayEq implements Walker { - - private final Object[] mLhs, mRhs; - - public ArrayEq(Object[] lhs, Object[] rhs) { - mLhs = lhs; - mRhs = rhs; - } - - private final void notEqual() { - throw new NotEq(); - } - - @Override - public void walk(NonRecursive engine) { - final TermEquivalence te = (TermEquivalence) engine; - if (mLhs != mRhs) { - if (mLhs.getClass() != mRhs.getClass()) { - // Cannot be equal - notEqual(); - } - if (mLhs.length != mRhs.length) { - notEqual(); - } - for (int i = 0; i < mLhs.length; ++i) { - if (mLhs[i] == mRhs[i]) { - continue; - } - if (mLhs[i] instanceof Term && mRhs[i] instanceof Term) { - te.enqueueWalker(new TermEq((Term) mLhs[i], (Term) mRhs[i])); - } else if (mLhs[i] instanceof Object[] && mRhs[i] instanceof Object[]) { - te.enqueueWalker(new ArrayEq((Object[]) mLhs[i], (Object[]) mRhs[i])); - } else { - if (mLhs[i] != mRhs[i] && (mLhs[i] == null || !mLhs[i].equals(mRhs[i]))) { - notEqual(); - } - } - } - } - } - } - - /** - * Returns true if the terms are equivalent. - * @param lhs the left hand side term. - * @param rhs the right hand side term. - * @return true if the terms are equivalent modulo variable renaming. - */ - public boolean equal(Term lhs, Term rhs) { - try { - run(new TermEq(lhs, rhs)); - return true; - } catch (final NotEq ignored) { - reset(); - return false; - } - } - -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermTransformer.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermTransformer.java deleted file mode 100644 index c97dbda7820..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermTransformer.java +++ /dev/null @@ -1,638 +0,0 @@ -/* - * Copyright (C) 2009-2021 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; - -import de.uni_freiburg.informatik.ultimate.util.datastructures.ScopedHashMap; - -/** - * This is the base class for transforming formulas. It does nothing by itself - * but you can use it to create arbitrary transformations on formulas. The - * transform method applies the transformation in a non-recursive manner. To - * achieve this it uses a todo stack, which contains terms and a small info how - * much of this term was already processed. Additionally it uses a convert stack - * that contains the most recent converted terms, which is used to collect the - * arguments of function calls and the subterm of other terms. - * - * Subclasses should override the function convert. It takes as argument the - * term to convert and should set its result with setResult. If it needs to - * build a more complex term with transformed arguments, it can enqueue the - * subclasses BuildLetTerm, BuildApplicationTerm, BuildAnnotatedTerm with - * enqueueWalker. The arguments should be added to the work queue by - * pushTerm/pushTerms. - * - * Of course, you can also add your own Build class that takes the converted - * arguments from the conversion stack using getConverted(). - * - * @author Jochen Hoenicke - */ -public class TermTransformer extends NonRecursive { - /** - * The term cache. - */ - private final ArrayList> mCache = new ArrayList<>(); - private final ScopedHashMap mScopeMap = new ScopedHashMap<>(); - - /** - * The converted terms. This is used for example to store the arguments of an - * application term, before the application term is evaluated. - */ - private final ArrayDeque mConverted = new ArrayDeque<>(); - - /** - * The converted object arrays. This is used to store the arguments of an array - * valued annotation, before the annotation's subterm is processed. - */ - private final ArrayDeque mConvertedArrays = new ArrayDeque<>(); - - /** - * This class represents one item of work. It consists of a term and some task - * that still needs to be performed on the term. - */ - private static class Convert implements Walker { - private final Term mTerm; - - public Convert(final Term term) { - mTerm = term; - } - - @Override - public String toString() { - return "Convert " + mTerm.toStringDirect(); - } - - @Override - public void walk(final NonRecursive walker) { - ((TermTransformer) walker).cacheConvert(mTerm); - } - } - - /** - * Push all terms in the array on the todo stack as CONVERT work item. - * - * @param terms - * the array of terms. - */ - protected final void pushTerms(final Term[] terms) { - for (int i = terms.length - 1; i >= 0; i--) { - pushTerm(terms[i]); - } - } - - /** - * Push a term on the todo stack as CONVERT work item. - * - * @param term - * the term to convert. - */ - protected final void pushTerm(final Term term) { - enqueueWalker(new Convert(term)); - } - - /** - * Set the conversion result to term. - * - * @param term - * the converted term. - */ - protected final void setResult(final Term term) { - mConverted.addLast(term); - } - - private int findScope(final TermVariable[] tvs) { - int maxScopeNr = 0; - for (final TermVariable tv : tvs) { - final Integer scopeNr = mScopeMap.get(tv); - if (scopeNr != null && scopeNr > maxScopeNr) { - maxScopeNr = scopeNr; - } - } - return maxScopeNr; - } - - private static class AddCache implements Walker { - Term mOldTerm; - - public AddCache(final Term term) { - mOldTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final int scopeNr = transformer.findScope(mOldTerm.getFreeVars()); - transformer.mCache.get(scopeNr).put(mOldTerm, transformer.mConverted.getLast()); - } - - @Override - public String toString() { - return "AddCache[" + mOldTerm.toStringDirect() + "]"; - } - } - - private void cacheConvert(final Term term) { - final int scopeNr = findScope(term.getFreeVars()); - final Term result = mCache.get(scopeNr).get(term); - if (result == null) { - enqueueWalker(new AddCache(term)); - convert(term); - } else { - setResult(result); - } - } - - protected void beginScope(final TermVariable[] vars) { - final Integer scopeNumber = mCache.size(); - mCache.add(new HashMap()); - mScopeMap.beginScope(); - for (final TermVariable var : vars) { - mScopeMap.put(var, scopeNumber); - } - } - - protected void endScope() { - final int scopeNr = mCache.size() - 1; - mCache.remove(scopeNr); - mScopeMap.endScope(); - } - - /** - * The function that does the transformation. Override this function if you - * build your own term transformer. It does not return the result but instead it - * puts it on the converted stack using setResult(). Instead it can also enqueue - * some Builders that will in the end put the result on the converted stack. - * - * You can always call super.convert() if you do not need to convert the term. - * It will still convert the sub-terms. If you do not want to convert the sub - * terms, call setResult(term) instead. - * - * @param term - * The term to convert. - */ - protected void convert(final Term term) { - if (term instanceof ConstantTerm || term instanceof TermVariable) { - mConverted.addLast(term); - } else if (term instanceof ApplicationTerm) { - enqueueWalker(new BuildApplicationTerm((ApplicationTerm) term)); - pushTerms(((ApplicationTerm) term).getParameters()); - } else if (term instanceof LetTerm) { - enqueueWalker(new StartLetTerm((LetTerm) term)); - pushTerms(((LetTerm) term).getValues()); - } else if (term instanceof QuantifiedFormula) { - final QuantifiedFormula qf = (QuantifiedFormula) term; - enqueueWalker(new BuildQuantifier(qf)); - pushTerm(qf.getSubformula()); - beginScope(qf.getVariables()); - } else if (term instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) term; - enqueueWalker(new BuildLambda(lambda)); - pushTerm(lambda.getSubterm()); - beginScope(lambda.getVariables()); - } else if (term instanceof AnnotatedTerm) { - final AnnotatedTerm annterm = (AnnotatedTerm) term; - enqueueWalker(new BuildAnnotation(annterm)); - final ArrayDeque todo = new ArrayDeque<>(); - for (final Annotation annot : annterm.getAnnotations()) { - if (annot.getValue() != null) { - todo.add(annot.getValue()); - } - } - while (!todo.isEmpty()) { - final Object value = todo.removeLast(); - if (value instanceof Term) { - pushTerm((Term) value); - } else if (value instanceof Object[]) { - enqueueWalker(new BuildObjectArray((Object[]) value)); - for (final Object elem : (Object[]) value) { - todo.add(elem); - } - } - } - pushTerm(annterm.getSubterm()); - return; - } else if (term instanceof MatchTerm) { - final MatchTerm matchTerm = (MatchTerm) term; - enqueueWalker(new WalkMatchTerm(matchTerm)); - pushTerm(matchTerm.getDataTerm()); - } else { - throw new AssertionError("Unknown Term: " + term.toStringDirect()); - } - } - - public void convertApplicationTerm(final ApplicationTerm appTerm, final Term[] newArgs) { - Term newTerm = appTerm; - if (newArgs != appTerm.getParameters()) { - final FunctionSymbol fun = appTerm.getFunction(); - final Theory theory = fun.getTheory(); - newTerm = theory.term(fun, newArgs); - } - setResult(newTerm); - } - - public void preConvertLet(final LetTerm oldLet, final Term[] newValues) { - beginScope(oldLet.getVariables()); - enqueueWalker(new BuildLetTerm(oldLet, newValues)); - pushTerm(oldLet.getSubTerm()); - } - - public void postConvertLet(final LetTerm oldLet, final Term[] newValues, final Term newBody) { - Term result = oldLet; - if (oldLet.getValues() != newValues || oldLet.getSubTerm() != newBody) { - result = oldLet.getTheory().let(oldLet.getVariables(), newValues, newBody); - } - setResult(result); - } - - public void postConvertLambda(final LambdaTerm old, final Term newBody) { - Term newFormula = old; - if (newBody != old.getSubterm()) { - final Theory theory = old.getTheory(); - final TermVariable[] vars = old.getVariables(); - newFormula = theory.lambda(vars, newBody); - } - setResult(newFormula); - } - - public void postConvertQuantifier(final QuantifiedFormula old, final Term newBody) { - Term newFormula = old; - if (newBody != old.getSubformula()) { - final Theory theory = old.getTheory(); - final TermVariable[] vars = old.getVariables(); - newFormula = old.getQuantifier() == QuantifiedFormula.EXISTS ? theory.exists(vars, newBody) - : theory.forall(vars, newBody); - } - setResult(newFormula); - } - - public void postConvertAnnotation(final AnnotatedTerm old, final Annotation[] newAnnots, final Term newBody) { - final Annotation[] annots = old.getAnnotations(); - Term result = old; - if (newBody != old.getSubterm() || newAnnots != annots) { - result = old.getTheory().annotatedTerm(newAnnots, newBody); - } - setResult(result); - } - - public void preConvertMatchCase(final MatchTerm oldMatch, final int caseNr) { - beginScope(oldMatch.getVariables()[caseNr]); - pushTerm(oldMatch.getCases()[caseNr]); - } - - public void postConvertMatch(final MatchTerm oldMatch, final Term newDataTerm, final Term[] newCases) { - Term result = oldMatch; - if (newDataTerm != oldMatch.getDataTerm() || newCases != oldMatch.getCases()) { - final Theory theory = oldMatch.getTheory(); - result = theory.match(newDataTerm, oldMatch.getVariables(), newCases, oldMatch.getConstructors()); - } - setResult(result); - } - - /** - * Transform a term. - * - * @param term - * the term to transform. - * @return the resulting transformed term. - */ - public final Term transform(final Term term) { - beginScope(new TermVariable[0]); - run(new Convert(term)); - endScope(); - return mConverted.removeLast(); - } - - /** - * Get a single converted term from the converted stack. This is the dual of - * pushTerm() that is called after the term were removed from the todo stack and - * pushed to the converted stack. - * - * @return the new converted term. - */ - protected final Term getConverted() { - return mConverted.removeLast(); - } - - /** - * Get a single converted object array from the converted stack. - * - * @return the new converted object array. - */ - protected final Object[] getConvertedObjectArray() { - return mConvertedArrays.removeLast(); - } - - /** - * Get the converted terms from the converted stack. This is the dual of - * pushTerms() that is called after the term were removed from the todo stack - * and pushed to the converted stack. It takes the old terms as argument and - * checks for changes. - * - * @param oldArgs - * the original arguments. - * @return the new converted arguments. It will return the same array oldArgs if - * there were no changes. - */ - protected final Term[] getConverted(final Term[] oldArgs) { - Term[] newArgs = oldArgs; - for (int i = oldArgs.length - 1; i >= 0; i--) { - final Term newTerm = getConverted(); - if (newTerm != oldArgs[i]) { - if (newArgs == oldArgs) { - newArgs = oldArgs.clone(); - } - newArgs[i] = newTerm; - } - } - return newArgs; - } - - /** - * Collect the arguments of an application term from the converted stack and - * finish the conversion of appTerm. This is called after the arguments of - * appTerm have been converted. It will put the converted term on the converted - * stack and store it in the cache. - */ - protected static class BuildApplicationTerm implements Walker { - /** the application term to convert. */ - private final ApplicationTerm mAppTerm; - - public BuildApplicationTerm(final ApplicationTerm term) { - mAppTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - /* collect args and check if they have been changed */ - final Term[] oldArgs = mAppTerm.getParameters(); - final Term[] newArgs = transformer.getConverted(oldArgs); - transformer.convertApplicationTerm(mAppTerm, newArgs); - } - - @Override - public String toString() { - return mAppTerm.getFunction().getApplicationString(); - } - } - - /** - * Walker that is called after the variable values are transformed and before - * the let body starts. - */ - protected static class StartLetTerm implements Walker { - /** the let term to convert. */ - private final LetTerm mLetTerm; - - public StartLetTerm(final LetTerm term) { - mLetTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Term[] values = transformer.getConverted(mLetTerm.getValues()); - transformer.preConvertLet(mLetTerm, values); - } - - @Override - public String toString() { - return "let" + Arrays.toString(mLetTerm.getVariables()); - } - } - - /** - * Collect the sub term and the values of a let term from the converted stack - * and finish the conversion of let term. - */ - protected static class BuildLetTerm implements Walker { - /** the let term to convert. */ - private final LetTerm mLetTerm; - /** the converted values that are letted to the variables. */ - private final Term[] mNewValues; - - public BuildLetTerm(final LetTerm term, final Term[] newValues) { - mLetTerm = term; - mNewValues = newValues; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Term newBody = transformer.getConverted(); - transformer.postConvertLet(mLetTerm, mNewValues, newBody); - transformer.endScope(); - } - - @Override - public String toString() { - return "let" + Arrays.toString(mLetTerm.getVariables()); - } - } - - /** - * Collect the sub term of a lambda term and build the converted formula. The - * converted sub formula is expected to be on the converted stack. It stores the - * converted quantifier on the converted stack and in the cache. - */ - protected static class BuildLambda implements Walker { - /** the quantifier to convert. */ - private final LambdaTerm mLambda; - - public BuildLambda(final LambdaTerm term) { - mLambda = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Term sub = transformer.getConverted(); - transformer.postConvertLambda(mLambda, sub); - transformer.endScope(); - } - - @Override - public String toString() { - return "lambda"; - } - } - - /** - * Collect the sub term of a quantified formula and build the converted formula. - * The converted sub formula is expected to be on the converted stack. It stores - * the converted quantifier on the converted stack and in the cache. - */ - protected static class BuildQuantifier implements Walker { - /** the quantifier to convert. */ - private final QuantifiedFormula mQuant; - - public BuildQuantifier(final QuantifiedFormula term) { - mQuant = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Term sub = transformer.getConverted(); - transformer.postConvertQuantifier(mQuant, sub); - transformer.endScope(); - } - - @Override - public String toString() { - return mQuant.getQuantifier() == QuantifiedFormula.EXISTS ? "exists" : "forall"; - } - } - - /** - * Collect the sub term and annotations of an annotated formula from the - * converted stack. It converts the annotation and stores the result in the - * cache and on the converted stack. Note that only Annotations that are of type - * Term or Term[] are converted. - */ - protected static class BuildAnnotation implements Walker { - /** the annotated term. */ - private final AnnotatedTerm mAnnotatedTerm; - - public BuildAnnotation(final AnnotatedTerm term) { - mAnnotatedTerm = term; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Annotation[] annots = mAnnotatedTerm.getAnnotations(); - Annotation[] newAnnots = annots; - for (int i = annots.length - 1; i >= 0; i--) { - final Object value = annots[i].getValue(); - Object newValue; - if (value instanceof Term) { - newValue = transformer.getConverted(); - } else if (value instanceof Object[]) { - newValue = transformer.getConvertedObjectArray(); - } else { - newValue = value; - } - if (newValue != value) { - if (annots == newAnnots) { - newAnnots = annots.clone(); - } - newAnnots[i] = new Annotation(annots[i].getKey(), newValue); - } - } - final Term sub = transformer.getConverted(); - transformer.postConvertAnnotation(mAnnotatedTerm, newAnnots, sub); - } - - @Override - public String toString() { - return "annotate"; - } - } - - /** - * Collect the sub terms and sub arrays of an array (part of an annotated - * formula). - */ - protected static class BuildObjectArray implements Walker { - private final Object[] mArray; - - public BuildObjectArray(final Object[] array) { - mArray = array; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - Object[] newArray = mArray; - for (int i = newArray.length - 1; i >= 0; i--) { - final Object value = newArray[i]; - Object newValue; - if (value instanceof Term) { - newValue = transformer.getConverted(); - } else if (value instanceof Object[]) { - newValue = transformer.getConvertedObjectArray(); - } else { - newValue = value; - } - if (newValue != value) { - if (mArray == newArray) { - newArray = mArray.clone(); - } - newArray[i] = newValue; - } - } - transformer.mConvertedArrays.addLast(newArray); - } - - @Override - public String toString() { - return "annotate"; - } - } - - /** - * Walk over each case of a match term, one after another. - */ - protected static class WalkMatchTerm implements Walker { - /** the match term. */ - private final MatchTerm mMatchTerm; - /** the next case nr to walk through */ - private int mCaseNr; - - public WalkMatchTerm(final MatchTerm term) { - mMatchTerm = term; - mCaseNr = 0; - } - - @Override - public void walk(final NonRecursive engine) { - final TermTransformer transformer = (TermTransformer) engine; - final Term[] cases = mMatchTerm.getCases(); - if (mCaseNr > 0) { - transformer.endScope(); - } - if (mCaseNr < cases.length) { - transformer.enqueueWalker(this); - transformer.preConvertMatchCase(mMatchTerm, mCaseNr); - mCaseNr++; - } else { - final Term[] newCases = transformer.getConverted(cases); - final Term newDataTerm = transformer.getConverted(); - transformer.postConvertMatch(mMatchTerm, newDataTerm, newCases); - } - } - - @Override - public String toString() { - return "annotate"; - } - } - - @Override - public void reset() { - super.reset(); - mConverted.clear(); - mCache.clear(); - mScopeMap.clear(); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermVariable.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermVariable.java deleted file mode 100644 index 7dd0c69829d..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/TermVariable.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.ArrayDeque; - -/** - * Represents a term variable that is used in a {@link LetTerm lets}, - * {@link QuantifiedFormula quantified formulas}, and - * {@link Script#defineFun(String, TermVariable[], Sort, Term) define-fun}. - * - * Term variables are created by {@link Script#variable(String, Sort)}. - * - * @author Juergen Christ - */ -public class TermVariable extends Term { - private final String mName; - private final Sort mSort; - - TermVariable(String n, Sort s, int hash) { - super(hash); - mName = n; - mSort = s; - } - - /** - * Return the name of the variable. - * @return the name of the variable. - */ - public String getName() { - return mName; - } - - /** - * Return the declared sort of the variable. - * @return the sort of the variable that was used to declare the variable. - * This is not expanded if the sort is a defined sort. - */ - public Sort getDeclaredSort() { - return mSort; - } - - /** - * Return the (expanded) sort of the variable. - * @return the expanded sort of the variable. - */ - @Override - public Sort getSort() { - return mSort.getRealSort(); - } - - /** - * The SMTLIB representation of the term. - */ - @Override - public String toString() { - return PrintTerm.quoteIdentifier(mName); - } - - static final int hashVariable(String name, Sort sort) { - return name.hashCode() ^ sort.hashCode(); - } - - /** - * {@inheritDoc} - */ - @Override - public void toStringHelper(ArrayDeque mTodo) { - mTodo.add(toString()); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Theory.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Theory.java deleted file mode 100644 index 3dcdf3cdb5d..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Theory.java +++ /dev/null @@ -1,1886 +0,0 @@ -/* - * Copyright (C) 2009-2014 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Map; - -import de.uni_freiburg.informatik.ultimate.util.HashUtils; -import de.uni_freiburg.informatik.ultimate.util.datastructures.ScopedHashMap; -import de.uni_freiburg.informatik.ultimate.util.datastructures.UnifyHash; - -/** - * The theory is not intended for public use. Please stick to the {@link Script} interface and use the functions in - * {@link Util} to simplify logical formulas. - * - * The theory is a container for the function symbols, sort symbols and a unifier for all terms created by this theory. - * Each sort belongs to one theory and since every function symbol and every term has a sort, they also belong to one - * theory. - * - * The theory also defines all predefined function symbols required by the logic that was set with setLogic(). It allows - * creating new function and sort symbols. - * - * @author Jochen Hoenicke - */ -public class Theory { - - /** - * Helper class to set up symbols specific to a solver. - * - * @author Juergen Christ - */ - public static abstract class SolverSetup { - /** - * Set up symbols needed by this solver. These symbols might depend upon the logic, e.g., the diff-symbol needed - * for quantifier-free array interpolation. - * - * @param theory - * The theory to be used by the solver. - * @param logic - * The logic set for this theory (@see {@link Theory#getLogic()}). - */ - public abstract void setLogic(Theory theory, Logics logic); - - /// *** Delegators *** - protected final static void declareInternalSort(final Theory theory, final String name, final int cardinality, - final int flags) { - theory.declareInternalSort(name, cardinality, flags); - } - - protected final static void declareInternalFunction(final Theory theory, final String name, - final Sort[] paramSorts, final Sort resultSort, final int flags) { - theory.declareInternalFunction(name, paramSorts, resultSort, flags); - } - - protected final static void declareInternalFunction(final Theory theory, final String name, - final Sort[] paramTypes, final TermVariable[] defVars, final Term definition, final int flags) { - theory.declareInternalFunction(name, paramTypes, defVars, definition, flags); - } - - protected final static void declareInternalPolymorphicFunction(final Theory theory, final String name, - final Sort[] sortParams, final Sort[] paramTypes, final Sort resultType, final int flags) { - theory.declareInternalPolymorphicFunction(name, sortParams, paramTypes, resultType, flags); - } - - protected final static void defineFunction(final Theory theory, final FunctionSymbolFactory factory) { - theory.declareInternalFunctionFactory(factory); - } - } - - private SolverSetup mSolverSetup; - private Logics mLogic; - private Sort mNumericSort, mRealSort, mStringSort, mBooleanSort; - private SortSymbol mBitVecSort, mFloatingPointSort; - private Sort mRoundingModeSort; - private final ScopedHashMap mFunFactory = new ScopedHashMap<>(); - private final UnifyHash mModelValueCache = new UnifyHash<>(); - - private final ScopedHashMap mDeclaredSorts = new ScopedHashMap<>(); - private final ScopedHashMap mDeclaredFuns = new ScopedHashMap<>(); - - private final UnifyHash mLetCache = new UnifyHash<>(); - private final UnifyHash mTermCache = new UnifyHash<>(); - private final UnifyHash mTvUnify = new UnifyHash<>(); - /** - * Factory for to_real wrapper function symbol, if IRA logic is used. - */ - private IRAWrapperFactory mIRAWrappers; - - public final ApplicationTerm mTrue, mFalse; - public final FunctionSymbol mAnd, mOr, mNot, mImplies, mXor; - public final PolymorphicFunctionSymbol mEquals, mDistinct; - - final static Sort[] EMPTY_SORT_ARRAY = Script.EMPTY_SORT_ARRAY; - final static TermVariable[] EMPTY_TERM_VARIABLE_ARRAY = {}; - final static Term[] EMPTY_TERM_ARRAY = Script.EMPTY_TERM_ARRAY; - /** - * Pattern for model value variables '{@literal @}digits'. - */ - private final static String MODEL_VALUE_PATTERN = "@\\d+"; - public final static String BITVEC_CONST_PATTERN = "bv\\d+"; - - private int mTvarCtr = 0; - - private int mAuxCounter = 0; - - private boolean mGlobalDecls; - - public Theory() { - mTrue = mFalse = null; - mAnd = mOr = mNot = mImplies = mXor = null; - mEquals = mDistinct = null; - } - - public Theory(final Logics logic) { - this(logic, null); - } - - /** - * Create the term factory. The solver setup should be used to create internal function symbols, e.g., to represent - * proof objects. - * - * @param logic - * The logic to use. - * @param solverSetup - * The solver-specific setup delegate. - */ - public Theory(final Logics logic, final SolverSetup solverSetup) { - mSolverSetup = solverSetup; - final Sort[] noarg = new Sort[0]; - mBooleanSort = declareInternalSort("Bool", 0, 0).getSort(null, noarg); - final Sort[] generic1 = createSortVariables("A"); - final Sort[] bool1 = new Sort[] { mBooleanSort }; - final Sort[] bool2 = new Sort[] { mBooleanSort, mBooleanSort }; - final Sort[] generic2 = new Sort[] { generic1[0], generic1[0] }; - final int leftassoc = FunctionSymbol.LEFTASSOC; - mNot = declareInternalFunction("not", bool1, mBooleanSort, 0); - mAnd = declareInternalFunction("and", bool2, mBooleanSort, leftassoc); - mOr = declareInternalFunction("or", bool2, mBooleanSort, leftassoc); - mImplies = declareInternalFunction("=>", bool2, mBooleanSort, FunctionSymbol.RIGHTASSOC); - mEquals = declareInternalPolymorphicFunction("=", generic1, generic2, mBooleanSort, FunctionSymbol.CHAINABLE); - mDistinct = declareInternalPolymorphicFunction("distinct", generic1, generic2, mBooleanSort, - FunctionSymbol.PAIRWISE); - mXor = declareInternalFunction("xor", bool2, mBooleanSort, leftassoc); - declareInternalPolymorphicFunction("ite", generic1, new Sort[] { mBooleanSort, generic1[0], generic1[0] }, - generic1[0], 0); - mTrue = (ApplicationTerm) term(declareInternalFunction("true", noarg, mBooleanSort, 0)); - mFalse = (ApplicationTerm) term(declareInternalFunction("false", noarg, mBooleanSort, 0)); - declareInternalSort(SMTLIBConstants.FUNC, 2, SortSymbol.FUNCTION); - - // Finally, declare logic specific functions - setLogic(logic); - } - - /** - * Method to check if indices is a numeral or symbol. If numeral return as BigInteger, if symbol return null - */ - public BigInteger toNumeral(final String index) { - try { - return new BigInteger(index); - } catch (final NumberFormatException e) { - throw new SMTLIBException("not a numeral: " + index, e); - } - } - - /** - * Method to check if the parameter is the name of a constructor. If so, return the constructor. - */ - public FunctionSymbol getFunctionSymbol(final String constructor) { - return mDeclaredFuns.get(constructor); - } - - /******************** LOGICAL OPERATORS *******************************/ - - private Term simplifyAndOr(final FunctionSymbol connector, final Term... subforms) { - final Term neutral = (connector == mAnd ? mTrue : mFalse); - final LinkedHashSet formulas = new LinkedHashSet<>(); - - for (final Term f : subforms) { - if (f == mTrue || f == mFalse) { - if (f == neutral) { - continue; - } - return f; - } - - /* Normalize nested and/ors */ - if (f instanceof ApplicationTerm && ((ApplicationTerm) f).getFunction() == connector) { - for (final Term subf : ((ApplicationTerm) f).getParameters()) { - formulas.add(subf); - } - } else { - formulas.add(f); - } - } - if (formulas.size() <= 1) { // NOPMD - if (formulas.isEmpty()) { - return neutral; - } - return formulas.iterator().next(); - } - final Term[] arrforms = formulas.toArray(new Term[formulas.size()]); - return term(connector, arrforms); - } - - public Term not(final Term f) { - if (f == mTrue) { - return mFalse; - } - if (f == mFalse) { - return mTrue; - } - if (f instanceof ApplicationTerm && ((ApplicationTerm) f).getFunction() == mNot) { - return ((ApplicationTerm) f).getParameters()[0]; - } - return term(mNot, f); - } - - public Term and(final Term... subforms) { - return simplifyAndOr(mAnd, subforms); - } - - public Term or(final Term... subforms) { - return simplifyAndOr(mOr, subforms); - } - - public Term implies(final Term f, final Term g) { - if (g == mTrue || f == mTrue) { - return g; - } - if (f == mFalse) { - return mTrue; - } - if (g == mFalse) { - return not(f); - } - if (f == g) { - return mTrue; - } - return term(mImplies, f, g); - } - - public Term xor(final Term f, final Term g) { - if (f == mTrue) { - return not(g); - } - if (g == mTrue) { - return not(f); - } - if (f == mFalse) { - return g; - } - if (g == mFalse) { - return f; - } - if (f == g) { - return mFalse; - } - return term(mXor, f, g); - } - - public Term ifthenelse(final Term c, final Term t, final Term e) { - if (c == mTrue) { - return t; - } - if (c == mFalse) { - return e; - } - if (t == e) { - return t; - } - if (t == mTrue && e == mFalse) { - return c; - } - if (t == mFalse && e == mTrue) { - return not(c); - } - if (t == mTrue) { - return term(mOr, c, e); - } - if (t == mFalse) { - return term(mAnd, term(mNot, c), e); - } - if (e == mTrue) { - return term(mImplies, c, t); - } - if (e == mFalse) { - return term(mAnd, c, t); - } - return term("ite", c, t, e); - } - - public Term lambda(final TermVariable[] vars, final Term subterm) { - final int hash = LambdaTerm.hashLambda(vars, subterm); - for (final Term term : mTermCache.iterateHashCode(hash)) { - if (term instanceof LambdaTerm) { - final LambdaTerm lambda = (LambdaTerm) term; - if (lambda.getSubterm() == subterm && Arrays.equals(lambda.getVariables(), vars)) { - return lambda; - } - } - } - final LambdaTerm lambda = new LambdaTerm(vars, subterm, hash); - mTermCache.put(hash, lambda); - return lambda; - } - - private Term quantify(final int quant, final TermVariable[] vars, final Term f) { - final int hash = QuantifiedFormula.hashQuantifier(quant, vars, f); - for (final Term term : mTermCache.iterateHashCode(hash)) { - if (term instanceof QuantifiedFormula) { - final QuantifiedFormula qf = (QuantifiedFormula) term; - if (qf.getQuantifier() == quant && qf.getSubformula() == f && Arrays.equals(vars, qf.getVariables())) { - return qf; - } - } - } - final QuantifiedFormula qf = new QuantifiedFormula(quant, vars, f, hash); - mTermCache.put(hash, qf); - return qf; - } - - public Term exists(final TermVariable[] vars, final Term f) { - return quantify(QuantifiedFormula.EXISTS, vars, f); - } - - public Term forall(final TermVariable[] vars, final Term f) { - return quantify(QuantifiedFormula.FORALL, vars, f); - } - - public Term match(final Term dataArg, final TermVariable[][] vars, final Term[] cases, - final DataType.Constructor[] constructors) { - - final int hash = MatchTerm.hashMatch(dataArg, vars, cases); - for (final Term t : mTermCache.iterateHashCode(hash)) { - if (t instanceof MatchTerm) { - final MatchTerm mt = (MatchTerm) t; - if (mt.getDataTerm() == dataArg && Arrays.equals(mt.getCases(), cases) - && Arrays.deepEquals(mt.getVariables(), vars) - && Arrays.equals(mt.getConstructors(), constructors)) { - return mt; - } - } - } - final MatchTerm mt = new MatchTerm(hash, dataArg, vars, cases, constructors); - mTermCache.put(hash, mt); - return mt; - } - - public Term let(final TermVariable[] vars, final Term[] values, final Term subform) { - assert (vars.length == values.length); - if (vars.length == 0) { - return subform; - } - final int hash = LetTerm.hashLet(vars, values, subform); - for (final LetTerm lt : mLetCache.iterateHashCode(hash)) { - if (lt.getSubTerm() == subform && Arrays.equals(lt.getVariables(), vars) - && Arrays.equals(lt.getValues(), values)) { - return lt; - } - } - final LetTerm lf = new LetTerm(vars, values, subform, hash); - mLetCache.put(hash, lf); - return lf; - } - - public Term let(final TermVariable var, final Term value, final Term subform) { - return let(new TermVariable[] { var }, new Term[] { value }, subform); - } - - public Term distinct(final Term... terms) { - if (terms.length < 2) { - return null; - } - if (terms.length == 2) { - if (terms[0] == terms[1]) { - return mFalse; - } - if (terms[0].getSort() == mBooleanSort) { - if (terms[0] == mFalse) { - return terms[1]; - } - if (terms[1] == mFalse) { - return terms[0]; - } - if (terms[0] == mTrue) { - return not(terms[1]); - } - if (terms[1] == mTrue) { - return not(terms[0]); - } - } - return term(mDistinct, terms); - } - final HashSet params = new HashSet<>(Arrays.asList(terms)); - if (params.size() != terms.length) { - // We had something like (distinct ... a ... a ...) - return mFalse; - } - return term(mDistinct, terms); - } - - public Term equals(final Term... terms) { - if (terms.length < 2) { - return null; - } - if (terms.length == 2) { - if (terms[0] == terms[1]) { - return mTrue; - } - if (terms[0].getSort() == mBooleanSort) { - if (terms[0] == mTrue) { - return terms[1]; - } - if (terms[1] == mTrue) { - return terms[0]; - } - if (terms[0] == mFalse) { - return not(terms[1]); - } - if (terms[1] == mFalse) { - return not(terms[0]); - } - } - return term(mEquals, terms); - } - final HashSet params = new HashSet<>(Arrays.asList(terms)); - if (params.size() == 1) { - // We had (= a a ... a) - return mTrue; - } - return term(mEquals, terms); - } - - /******************** CONSTANTS *************************************/ - - public Term constant(final Object value, final Sort sort) { - if (value instanceof Rational) { - if (!sort.isNumericSort()) { - throw new SMTLIBException("Not a numeric sort"); - } - final Rational v = (Rational) value; - if (!v.isRational()) { - throw new SMTLIBException("Infinite/NaN value"); - } - if (sort.getName().equals("Int") && !v.isIntegral()) { - throw new SMTLIBException("Non-integral value with integer sort"); - } - } - if (sort.isBitVecSort()) { - if (value instanceof BigInteger) { - final BigInteger intValue = (BigInteger) value; - if (intValue.signum() < 0 || intValue.bitLength() > Integer.valueOf(sort.getIndices()[0])) { - throw new SMTLIBException("Bitvector constant out of range"); - } - } - } - final int hash = ConstantTerm.hashConstant(value, sort); - for (final Term t : mTermCache.iterateHashCode(hash)) { - if (t instanceof ConstantTerm) { - final ConstantTerm nt = (ConstantTerm) t; - if (nt.getSort() == sort && value.equals(nt.getValue())) { - return nt; - } - } - } - final ConstantTerm nt = new ConstantTerm(value, sort, hash); - mTermCache.put(hash, nt); - return nt; - } - - public Term numeral(final BigInteger num) { - if (mNumericSort != mRealSort) { - // For integer sort, always use Rational constants for numerals. - return constant(Rational.valueOf(num, BigInteger.ONE), mNumericSort); - } - // For real arithmetic using Rational would convert to decimal, which we want to avoid. - // positive and negated numerals are represented as constants of BigInteger type - // instead. - return constant(num, mNumericSort); - } - - public Term numeral(final String num) { - return numeral(toNumeral(num)); - } - - public Term decimal(final BigDecimal value) { - // Check if this is uses the default scale and no fractional part. - // In this case we create a rational constant instead. - // Also handle BigDecimal without scale to distinguish them from numerals. - if (value.scale() <= 0 || (value.scale() == 1 && value.remainder(BigDecimal.ONE).signum() == 0)) { - return constant(Rational.valueOf(value.toBigIntegerExact(), BigInteger.ONE), mRealSort); - } - // If the input contains something like 0.1, don't automatically convert to (/ 1.0 10.0), to avoid - // changing the input. - Term result = constant(value.abs(), mRealSort); - // positive non-normalized decimals are represented as BigDecimal constants - // negative BigDecimals like -0.1 are normalized to the SMT term (- 0.1) - if (value.signum() < 0) { - final FunctionSymbol neg = getFunction("-", mRealSort); - result = term(neg, result); - } - return result; - } - - public Term decimal(final String value) { - return decimal(new BigDecimal(value)); - } - - /** - * Convert a rational constant to a term of the correct sort. The constant must be integral if the sort is integer. - * - * @param c - * the constant to convert. - * @param sort - * the sort; either Real or Int. - * @return an smt term representing constant c. - */ - public Term rational(final Rational c, final Sort sort) { - return constant(c, sort); - } - - public Term binary(final String value) { - assert value.startsWith("#b"); - if (mBitVecSort == null) { - return null; - } - final String bsize = String.valueOf(value.length() - 2); - final Sort sort = mBitVecSort.getSort(new String[] { bsize }, new Sort[0]); - return new ConstantTerm(value, sort, ConstantTerm.hashConstant(value, sort)); - } - - public Term hexadecimal(final String value) { - assert value.startsWith("#x"); - if (mBitVecSort == null) { - return null; - } - final String bsize = String.valueOf(4 * (value.length() - 2));// NOCHECKSTYLE - final Sort sort = mBitVecSort.getSort(new String[] { bsize }, new Sort[0]); - return new ConstantTerm(value, sort, ConstantTerm.hashConstant(value, sort)); - } - - public Term modelRational(final Rational rat, final Sort sort) { - final BigInteger num = rat.numerator(); - final BigInteger denom = rat.denominator(); - - if (sort == mRealSort) { - if (mLogic.isIRA()) { - final FunctionSymbol div = getFunction("/", mRealSort, mRealSort); - final FunctionSymbol toreal = getFunction("to_real", mNumericSort); - Term numeralTerm = term(toreal, numeral(num.abs())); - if (num.signum() < 0) { - numeralTerm = term("-", numeralTerm); - } - return term(div, numeralTerm, term(toreal, numeral(denom))); - } else { - if (denom.equals(BigInteger.ONE)) { - return decimal(new BigDecimal(num)); - } - final FunctionSymbol div = getFunction("/", mNumericSort, mNumericSort); - return term(div, numeral(num), numeral(denom)); - } - } else { - assert denom.equals(BigInteger.ONE); - return numeral(rat.numerator()); - } - } - - public Term string(final QuotedObject value) { - return constant(value, mStringSort); - } - - /******************** LOGICS AND THEORIES ********************************/ - public Logics getLogic() { - return mLogic; - } - - public FunctionSymbol declareInternalFunction(final String name, final Sort[] paramTypes, final Sort resultType, - final int flags) { - return defineFunction(name, paramTypes, resultType, null, null, flags | FunctionSymbol.INTERNAL); - } - - public FunctionSymbol declareInternalFunction(final String name, final Sort[] paramTypes, - final TermVariable[] defVars, final Term definition, final int flags) { - return defineFunction(name, paramTypes, definition.getSort(), defVars, definition, - flags | FunctionSymbol.INTERNAL); - } - - public PolymorphicFunctionSymbol declareInternalPolymorphicFunction(final String name, final Sort[] sortParams, - final Sort[] paramTypes, final Sort resultType, final int flags) { - assert !mFunFactory.containsKey(name); - final PolymorphicFunctionSymbol f = new PolymorphicFunctionSymbol(name, sortParams, paramTypes, resultType, - flags | FunctionSymbol.INTERNAL); - declareInternalFunctionFactory(f); - return f; - } - - class MinusFunctionFactory extends FunctionSymbolFactory { - Sort mSort1, mSort2; - - public MinusFunctionFactory(final Sort sort1, final Sort sort2) { - super(SMTLIBConstants.MINUS); - mSort1 = sort1; - mSort2 = sort2; - } - - @Override - public int getFlags(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return paramSorts.length == 1 ? FunctionSymbol.INTERNAL - : FunctionSymbol.LEFTASSOC | FunctionSymbol.INTERNAL; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length == 0 || paramSorts.length > 2 || resultSort != null - || (paramSorts[0] != mSort1 && paramSorts[0] != mSort2)) { - return null; - } - - if (paramSorts.length == 2 && paramSorts[0] != paramSorts[1]) { - return null; - } - - return paramSorts[0]; - } - } - - class DivisibleFunctionFactory extends FunctionSymbolFactory { - public DivisibleFunctionFactory() { - super("divisible"); - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return indices != null && indices.length == 1 && toNumeral(indices[0]).signum() > 0 - && paramSorts.length == 1 && paramSorts[0] == mNumericSort && resultSort == null ? mBooleanSort - : null; - } - } - - private Term absDefinition(final TermVariable x) { - final Term zero = Rational.ZERO.toTerm(x.getSort()); - return term(SMTLIBConstants.ITE, term(SMTLIBConstants.LT, x, zero), term(SMTLIBConstants.MINUS, x), x); - } - - private void createNumericOperators(final Sort sort, final boolean isRealArith) { - final Sort[] sort1 = new Sort[] { sort }; - final Sort[] sort2 = new Sort[] { sort, sort }; - declareInternalFunction(SMTLIBConstants.PLUS, sort2, sort, FunctionSymbol.LEFTASSOC); - declareInternalFunctionFactory(new MinusFunctionFactory(sort, sort)); - declareInternalFunction(SMTLIBConstants.MUL, sort2, sort, FunctionSymbol.LEFTASSOC); - /* the functions /, div and mod are partial (for division by 0) and thus partially uninterpreted */ - if (isRealArith) { - declareInternalFunction(SMTLIBConstants.DIVIDE, sort2, sort, - FunctionSymbol.LEFTASSOC | FunctionSymbol.UNINTERPRETEDINTERNAL); - } else { - declareInternalFunction(SMTLIBConstants.DIV, sort2, sort, - FunctionSymbol.LEFTASSOC | FunctionSymbol.UNINTERPRETEDINTERNAL); - declareInternalFunction(SMTLIBConstants.MOD, sort2, sort, FunctionSymbol.UNINTERPRETEDINTERNAL); - declareInternalFunctionFactory(new DivisibleFunctionFactory()); - } - final Sort sBool = mBooleanSort; - declareInternalFunction(SMTLIBConstants.GT, sort2, sBool, FunctionSymbol.CHAINABLE); - declareInternalFunction(SMTLIBConstants.GEQ, sort2, sBool, FunctionSymbol.CHAINABLE); - declareInternalFunction(SMTLIBConstants.LT, sort2, sBool, FunctionSymbol.CHAINABLE); - declareInternalFunction(SMTLIBConstants.LEQ, sort2, sBool, FunctionSymbol.CHAINABLE); - - final TermVariable x = createTermVariable("x", sort); - declareInternalFunction(SMTLIBConstants.ABS, sort1, new TermVariable[] { x }, absDefinition(x), 0); - } - - private void createIRAOperators() { - mIRAWrappers = new IRAWrapperFactory(); - class BinArithFactory extends FunctionSymbolFactory { - Sort mReturnSort; - int mFlags; - - BinArithFactory(final String name, final Sort returnSort, final int flags) { - super(name); - mReturnSort = returnSort; - mFlags = flags | FunctionSymbol.INTERNAL; - } - - @Override - public int getFlags(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return mFlags; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null && paramSorts.length == 2 && paramSorts[0] == paramSorts[1] - && (paramSorts[0] == mNumericSort || paramSorts[0] == mRealSort) && resultSort == null) { - return mReturnSort == null ? paramSorts[0] : mReturnSort; - } - return null; - } - } - - declareInternalFunctionFactory(new BinArithFactory("+", null, FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new MinusFunctionFactory(mNumericSort, mRealSort)); - declareInternalFunctionFactory(new BinArithFactory("*", null, FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new BinArithFactory(">", mBooleanSort, FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new BinArithFactory(">=", mBooleanSort, FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new BinArithFactory("<", mBooleanSort, FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new BinArithFactory("<=", mBooleanSort, FunctionSymbol.CHAINABLE)); - - final Sort[] int1 = new Sort[] { mNumericSort }; - final Sort[] int2 = new Sort[] { mNumericSort, mNumericSort }; - final Sort[] real1 = new Sort[] { mRealSort }; - final Sort[] real2 = new Sort[] { mRealSort, mRealSort }; - declareInternalFunction("/", real2, mRealSort, FunctionSymbol.LEFTASSOC); - declareInternalFunction("div", int2, mNumericSort, FunctionSymbol.LEFTASSOC); - declareInternalFunctionFactory(new DivisibleFunctionFactory()); - declareInternalFunction("to_real", int1, mRealSort, 0); - declareInternalFunction("to_int", real1, mNumericSort, 0); - - declareInternalFunction("mod", int2, mNumericSort, 0); - final TermVariable xr = createTermVariable("x1", mRealSort); - // isint x: (= x (to_real (to_int x))) - final Term isintx = term("=", xr, term("to_real", term("to_int", xr))); - declareInternalFunction("is_int", real1, new TermVariable[] { xr }, isintx, 0); - - declareInternalFunctionFactory(new FunctionSymbolFactory("abs") { - @Override - public Term getDefinition(final TermVariable[] tvs, final Sort resultSort) { - return absDefinition(tvs[0]); - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null && paramSorts.length == 1 - && (paramSorts[0] == mNumericSort || paramSorts[0] == mRealSort) && resultSort == null) { - return paramSorts[0]; - } - return null; - } - }); - - } - - private void createArrayOperators() { - final Sort[] generic2 = createSortVariables("X", "Y"); - final SortSymbol arraySort = declareInternalSort("Array", 2, SortSymbol.ARRAY); - - // (Array X Y) - final Sort array = arraySort.getSort(null, generic2); - // select : ((Array X Y) X) -> Y - declareInternalPolymorphicFunction("select", generic2, new Sort[] { array, generic2[0] }, generic2[1], 0); - // store : ((Array X Y) X Y) -> (Array X Y) - declareInternalPolymorphicFunction("store", generic2, new Sort[] { array, generic2[0], generic2[1] }, array, 0); - // const : (Y) -> (Array X Y) - declareInternalPolymorphicFunction(SMTLIBConstants.CONST, generic2, new Sort[] { generic2[1] }, array, - FunctionSymbol.INTERNAL | FunctionSymbol.RETURNOVERLOAD); - final Sort lambdaSort = getSort(SMTLIBConstants.FUNC, generic2); - // arrayof : (-> X Y) -> (Array X Y) - declareInternalPolymorphicFunction(SMTLIBConstants.ARRAYOF, generic2, new Sort[] { lambdaSort }, array, - FunctionSymbol.INTERNAL | FunctionSymbol.RETURNOVERLOAD); - } - - private void createBitVecSort() { - mBitVecSort = new SortSymbol(this, "BitVec", 0, null, SortSymbol.INTERNAL | SortSymbol.INDEXED) { - @Override - public void checkArity(final String[] indices, final int arity) { - if (indices == null || indices.length != 1) { - throw new IllegalArgumentException("BitVec needs one index"); - } - if (toNumeral(indices[0]).signum() <= 0) { - throw new IllegalArgumentException("BitVec index must be positive"); - } - if (arity != 0) { - throw new IllegalArgumentException("BitVec has no parameters"); - } - } - }; - mDeclaredSorts.put("BitVec", mBitVecSort); - } - - private void createBitVecOperators() { - class RegularBitVecFunction extends FunctionSymbolFactory { - int mNumArgs; - int mFlags; - Sort mResult; - - public RegularBitVecFunction(final String name, final int numArgs, final Sort result, final int flags) { - super(name); - mNumArgs = numArgs; - mResult = result; - mFlags = flags; - } - - public RegularBitVecFunction(final String name, final int numArgs, final Sort result) { - this(name, numArgs, result, FunctionSymbol.INTERNAL); - } - - @Override - public int getFlags(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return mFlags; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length != mNumArgs || resultSort != null - || paramSorts[0].getName() != "BitVec") { - return null; - } - for (int i = 1; i < mNumArgs; i++) { - if (paramSorts[i] != paramSorts[0]) { - return null; - } - } - return mResult == null ? paramSorts[0] : mResult; - } - } - class ExtendBitVecFunction extends FunctionSymbolFactory { - public ExtendBitVecFunction(final String name) { - super(name); - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 1 || resultSort != null - || paramSorts[0].getName() != "BitVec") { - return null; - } - final BigInteger size = toNumeral(indices[0]).add(toNumeral(paramSorts[0].getIndices()[0])); - return mBitVecSort.getSort(new String[] { size.toString() }, new Sort[0]); - } - } - class RotateBitVecFunction extends FunctionSymbolFactory { - public RotateBitVecFunction(final String name) { - super(name); - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 1 || resultSort != null - || paramSorts[0].getName() != "BitVec") { - return null; - } - return paramSorts[0]; - } - } - class Bv2NatFunction extends FunctionSymbolFactory { - public Bv2NatFunction(final String name) { - super(name); - assert name.equals("bv2nat") : "Wrong name: " + name; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length != 1 || paramSorts[0].getName() != "BitVec" - || resultSort != null) { - return null; - } - return mNumericSort; - } - } - class Nat2BvFunction extends FunctionSymbolFactory { - public Nat2BvFunction(final String name) { - super(name); - assert name.equals("nat2bv") : "Wrong name: " + name; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 1 - || !paramSorts[0].getName().equals("Int") || resultSort != null) { - return null; - } - return mBitVecSort.getSort(indices); - } - } - declareInternalFunctionFactory(new FunctionSymbolFactory("concat") { - @Override - public int getFlags(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return FunctionSymbol.INTERNAL; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length != 2 || resultSort != null - || paramSorts[0].getName() != "BitVec" || paramSorts[1].getName() != "BitVec") { - return null; - } - - final BigInteger paramSortAsInt0 = toNumeral(paramSorts[0].getIndices()[0]); - final BigInteger paramSortAsInt1 = toNumeral(paramSorts[1].getIndices()[0]); - - final BigInteger size = paramSortAsInt0.add(paramSortAsInt1); - // before: final BigInteger size = paramSorts[0].getIndices()[0].add(paramSorts[1].getIndices()[0]); - return mBitVecSort.getSort(new String[] { size.toString() }, new Sort[0]); - // what does { size } ? - } - }); - declareInternalFunctionFactory(new FunctionSymbolFactory("extract") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length < 2 || paramSorts.length != 1 || resultSort != null - || paramSorts[0].getName() != "BitVec") { - return null; - } - final BigInteger idxFirst = toNumeral(indices[0]); - final BigInteger idxScnd = toNumeral(indices[1]); - final BigInteger paramLength = toNumeral(paramSorts[0].getIndices()[0]); - if (idxFirst.compareTo(idxScnd) < 0 || paramLength.compareTo(idxFirst) < 0) { - return null; - } - final BigInteger size = idxFirst.subtract(idxScnd).add(BigInteger.ONE); - return mBitVecSort.getSort(new String[] { size.toString() }, new Sort[0]); - } - }); - final Sort bitvec1 = mBitVecSort.getSort(new String[] { BigInteger.ONE.toString() }, new Sort[0]); - - declareInternalFunctionFactory(new RegularBitVecFunction("bvnot", 1, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvand", 2, null, FunctionSymbol.INTERNAL | FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvor", 2, null, FunctionSymbol.INTERNAL | FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvneg", 1, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvadd", 2, null, FunctionSymbol.INTERNAL | FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvmul", 2, null, FunctionSymbol.INTERNAL | FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvudiv", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvurem", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvshl", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvlshr", 2, null)); - - declareInternalFunctionFactory(new RegularBitVecFunction("bvnand", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvnor", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvxor", 2, null, FunctionSymbol.INTERNAL | FunctionSymbol.LEFTASSOC)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvxnor", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvcomp", 2, bitvec1)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsub", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsdiv", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsrem", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsmod", 2, null)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvashr", 2, null)); - - declareInternalFunctionFactory(new FunctionSymbolFactory("repeat") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 1 || resultSort != null - || paramSorts[0].getName() != "BitVec") { - return null; - } - final BigInteger size = toNumeral(indices[0]).multiply(toNumeral(paramSorts[0].getIndices()[0])); - return mBitVecSort.getSort(new String[] { size.toString() }, new Sort[0]); - } - }); - declareInternalFunctionFactory(new ExtendBitVecFunction("zero_extend")); - declareInternalFunctionFactory(new ExtendBitVecFunction("sign_extend")); - declareInternalFunctionFactory(new RotateBitVecFunction("rotate_left")); - declareInternalFunctionFactory(new RotateBitVecFunction("rotate_right")); - - declareInternalFunctionFactory(new RegularBitVecFunction("bvult", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvule", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvugt", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvuge", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvslt", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsle", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsgt", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularBitVecFunction("bvsge", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - - declareInternalFunctionFactory(new Bv2NatFunction("bv2nat")); - declareInternalFunctionFactory(new Nat2BvFunction("nat2bv")); - - - - } - - private void createFloatingPointOperators() { - - mFloatingPointSort = new SortSymbol(this, "FloatingPoint", 0, null, SortSymbol.INTERNAL | SortSymbol.INDEXED) { - @Override - public void checkArity(final String[] indices, final int arity) { - if (indices == null || indices.length != 2) { - throw new IllegalArgumentException("Floating Point needs two indices"); - } - - if (toNumeral(indices[0]).signum() <= 0 || toNumeral(indices[1]).signum() <= 0) { - throw new IllegalArgumentException("FloatingPoint indices must be greater 0"); - } - - if (arity != 0) { - throw new IllegalArgumentException("FloatingPoint has no parameters"); - } - } - }; - - mDeclaredSorts.put("FloatingPoint", mFloatingPointSort); - mRoundingModeSort = declareInternalSort("RoundingMode", 0, 0).getSort(null, new Sort[0]); - - /* - * Used to create Functions of the Floating Point theory - */ - class RegularFloatingPointFunction extends FunctionSymbolFactory { - int mNumArgs; - Sort mResult; - int mFlags; - int mFirstFloat; - - public RegularFloatingPointFunction(final String name, final int numArgs, final Sort result, - final int flags) { - super(name); - mNumArgs = numArgs; - mResult = result; - mFlags = flags; - } - - @Override - public int getFlags(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - return mFlags; - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length != mNumArgs || resultSort != null) { - return null; - } - if (paramSorts[0].getName() == ("RoundingMode")) { - mFirstFloat = 1; - } else { - mFirstFloat = 0; - } - for (int i = mFirstFloat; i < mNumArgs; i++) { - if (paramSorts[i].getName() != "FloatingPoint") { - return null; - } - } - return mResult == null ? paramSorts[mFirstFloat] : mResult; - } - } - - declareInternalFunctionFactory(new FunctionSymbolFactory("fp") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices != null || paramSorts.length != 3 || resultSort != null - || paramSorts[0].getName() != "BitVec" || paramSorts[1].getName() != "BitVec" - || paramSorts[2].getName() != "BitVec") { - return null; - } - final BigInteger fpSignIndex = toNumeral(paramSorts[0].getIndices()[0]); - if (!fpSignIndex.equals(BigInteger.ONE)) { - return null; - } - final String[] fpIndices = new String[2]; - fpIndices[0] = toNumeral(paramSorts[1].getIndices()[0]).toString(); - fpIndices[1] = toNumeral(paramSorts[2].getIndices()[0]).add(BigInteger.ONE).toString(); - return mFloatingPointSort.getSort(fpIndices, new Sort[0]); - } - }); - - // from BitVec to FP - declareInternalFunctionFactory(new FunctionSymbolFactory("to_fp") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 2 || paramSorts == null) { - return null; - } - // from BitVec to FP - if (paramSorts.length == 1 && paramSorts[0].getName() == "BitVec") { - if (!((toNumeral(indices[0]).add(toNumeral(indices[1])) - .equals(toNumeral(paramSorts[0].getIndices()[0]))))) { - return null; - } - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - - // from FP to FP - if (paramSorts.length == 2 && paramSorts[0].getName() == "RoundingMode" - && (paramSorts[1].getName() == "FloatingPoint")) { - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - - // from real to FP - if (paramSorts.length == 2 && paramSorts[0].getName() == "RoundingMode" - && paramSorts[1].getName() == "Real") { - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - - // from signed machine integer, represented as a 2's complement bit vector to FP - if (paramSorts.length == 2 && paramSorts[0].getName() == "RoundingMode" - && paramSorts[1].getName() == "BitVec") { - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - return null; - } - }); - - declareInternalFunctionFactory(new FunctionSymbolFactory("to_fp_unsigned") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 2 || paramSorts.length != 2 || resultSort != null - || paramSorts[0].getName() != "RoundingMode" || paramSorts[1].getName() != "BitVec") { - return null; - } - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - }); - - declareInternalFunctionFactory(new FunctionSymbolFactory("fp.to_ubv") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 2 || resultSort != null - || paramSorts[0].getName() != "RoundingMode" || paramSorts[1].getName() != "FloatingPoint") { - return null; - } - return mBitVecSort.getSort(new String[] { indices[0] }, new Sort[0]); - } - }); - - declareInternalFunctionFactory(new FunctionSymbolFactory("fp.to_sbv") { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 2 || resultSort != null - || paramSorts[0].getName() != "RoundingMode" || paramSorts[1].getName() != "FloatingPoint") { - return null; - } - return mBitVecSort.getSort(new String[] { indices[0] }, new Sort[0]); - } - }); - - /* - * Used to create Constants of the Floating Point theory - */ - class FloatingPointConstant extends FunctionSymbolFactory { - public FloatingPointConstant(final String name) { - super(name); - } - - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices.length != 2 || paramSorts.length != 0 || resultSort != null) { - return null; - } - return mFloatingPointSort.getSort(indices, new Sort[0]); - } - } - // +/- infinity - declareInternalFunctionFactory(new FloatingPointConstant("+oo")); - declareInternalFunctionFactory(new FloatingPointConstant("-oo")); - // +/- zero - declareInternalFunctionFactory(new FloatingPointConstant("+zero")); - declareInternalFunctionFactory(new FloatingPointConstant("-zero")); - - declareInternalFunctionFactory(new FloatingPointConstant("NaN")); - - // short forms of common floats - defineSort("Float16", 0, mFloatingPointSort.getSort(new String[] { new String("5"), new String("11") })); - defineSort("Float32", 0, mFloatingPointSort.getSort(new String[] { new String("8"), new String("24") })); - defineSort("Float64", 0, mFloatingPointSort.getSort(new String[] { new String("11"), new String("53") })); - defineSort("Float128", 0, mFloatingPointSort.getSort(new String[] { new String("15"), new String("113") })); - - // RoundingModes - declareInternalFunction("roundNearestTiesToEven", new Sort[0], mRoundingModeSort, 0); - declareInternalFunction("roundNearestTiesToAway", new Sort[0], mRoundingModeSort, 0); - declareInternalFunction("roundTowardPositive", new Sort[0], mRoundingModeSort, 0); - declareInternalFunction("roundTowardNegative", new Sort[0], mRoundingModeSort, 0); - declareInternalFunction("roundTowardZero", new Sort[0], mRoundingModeSort, 0); - defineFunction("RNE", new Sort[0], mRoundingModeSort, new TermVariable[0], term("roundNearestTiesToEven"), - FunctionSymbol.INTERNAL); - defineFunction("RNA", new Sort[0], mRoundingModeSort, new TermVariable[0], term("roundNearestTiesToAway"), - FunctionSymbol.INTERNAL); - defineFunction("RTP", new Sort[0], mRoundingModeSort, new TermVariable[0], term("roundTowardPositive"), - FunctionSymbol.INTERNAL); - defineFunction("RTN", new Sort[0], mRoundingModeSort, new TermVariable[0], term("roundTowardNegative"), - FunctionSymbol.INTERNAL); - defineFunction("RTZ", new Sort[0], mRoundingModeSort, new TermVariable[0], term("roundTowardZero"), - FunctionSymbol.INTERNAL); - - // Operators - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.abs", 1, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.neg", 1, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.min", 2, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.max", 2, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.rem", 2, null, FunctionSymbol.INTERNAL)); - // rounded operators - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.add", 3, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.sub", 3, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.mul", 3, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.div", 3, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.fma", 4, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.sqrt", 2, null, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.roundToIntegral", 2, null, FunctionSymbol.INTERNAL)); - - // Comparison Operators - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.leq", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.lt", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.geq", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.gt", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.eq", 2, mBooleanSort, - FunctionSymbol.INTERNAL | FunctionSymbol.CHAINABLE)); - - // Classification of numbers - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isNormal", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isSubnormal", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isZero", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isInfinite", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isNaN", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isNegative", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.isPositive", 1, mBooleanSort, FunctionSymbol.INTERNAL)); - - // Conversion from FP - declareInternalFunctionFactory(new RegularFloatingPointFunction("fp.to_real", 1, mRealSort, FunctionSymbol.INTERNAL)); - } - - private void createStringOperators() { - final Sort str = declareInternalSort(SMTLIBConstants.STRING, 0, 0).getSort(null); - final Sort re = declareInternalSort(SMTLIBConstants.REGLAN, 0, 0).getSort(null); - mStringSort = str; - final Sort[] str1 = new Sort[] { str }; - final Sort[] str2 = new Sort[] { str, str }; - final Sort[] str3 = new Sort[] { str, str, str }; - final Sort[] str_re = new Sort[] { str, re }; - final Sort[] str_re_str = new Sort[] { str, re, str }; - final Sort[] re1 = new Sort[] { re }; - final Sort[] re2 = new Sort[] { re, re }; - declareInternalFunctionFactory(new FunctionSymbolFactory(SMTLIBConstants.CHAR) { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 0 || resultSort != null) { - return null; - } - final String index = indices[0]; - if (!index.startsWith("#x") || index.length() <= 2 || index.length() > 7 - || (index.length() == 7 && index.charAt(2) > '2')) { - return null; - } - return str; - } - }); - declareInternalFunction(SMTLIBConstants.STR_CONCAT, str2, str, FunctionSymbol.LEFTASSOC); - declareInternalFunction(SMTLIBConstants.STR_LT, str2, mBooleanSort, FunctionSymbol.CHAINABLE); - declareInternalFunction(SMTLIBConstants.STR_TO_RE, str1, re, 0); - declareInternalFunction(SMTLIBConstants.STR_IN_RE, str_re, mBooleanSort, 0); - declareInternalFunction(SMTLIBConstants.RE_NONE, EMPTY_SORT_ARRAY, re, 0); - declareInternalFunction(SMTLIBConstants.RE_ALL, EMPTY_SORT_ARRAY, re, 0); - declareInternalFunction(SMTLIBConstants.RE_ALLCHAR, EMPTY_SORT_ARRAY, re, 0); - declareInternalFunction(SMTLIBConstants.RE_CONCAT, re2, re, FunctionSymbol.LEFTASSOC); - declareInternalFunction(SMTLIBConstants.RE_UNION, re2, re, FunctionSymbol.LEFTASSOC); - declareInternalFunction(SMTLIBConstants.RE_INTER, re2, re, FunctionSymbol.LEFTASSOC); - declareInternalFunction(SMTLIBConstants.RE_STAR, re1, re, 0); - - declareInternalFunction(SMTLIBConstants.STR_LE, str2, mBooleanSort, FunctionSymbol.CHAINABLE); - declareInternalFunction(SMTLIBConstants.STR_PREFIXOF, str2, mBooleanSort, 0); - declareInternalFunction(SMTLIBConstants.STR_SUFFIXOF, str2, mBooleanSort, 0); - declareInternalFunction(SMTLIBConstants.STR_CONTAINS, str2, mBooleanSort, 0); - declareInternalFunction(SMTLIBConstants.STR_REPLACE, str3, str, 0); - declareInternalFunction(SMTLIBConstants.STR_REPLACE_ALL, str3, str, 0); - declareInternalFunction(SMTLIBConstants.STR_REPLACE_RE, str_re_str, str, 0); - declareInternalFunction(SMTLIBConstants.STR_REPLACE_RE_ALL, str_re_str, str, 0); - - declareInternalFunction(SMTLIBConstants.RE_COMP, re1, re, 0); - declareInternalFunction(SMTLIBConstants.RE_DIFF, re2, re, FunctionSymbol.LEFTASSOC); - declareInternalFunction(SMTLIBConstants.RE_PLUS, re1, re, 0); - declareInternalFunction(SMTLIBConstants.RE_OPT, re1, re, 0); - declareInternalFunction(SMTLIBConstants.RE_RANGE, str2, re, 0); - - declareInternalFunction(SMTLIBConstants.STR_IS_DIGIT, str1, mBooleanSort, 0); - - declareInternalFunctionFactory(new FunctionSymbolFactory(SMTLIBConstants.RE_ITER) { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 1 || paramSorts.length != 1 || resultSort != null - || paramSorts[0] != re) { - return null; - } - toNumeral(indices[0]); - return re; - } - }); - declareInternalFunctionFactory(new FunctionSymbolFactory(SMTLIBConstants.RE_LOOP) { - @Override - public Sort getResultSort(final String[] indices, final Sort[] paramSorts, final Sort resultSort) { - if (indices == null || indices.length != 2 || paramSorts.length != 1 || resultSort != null - || paramSorts[0] != re) { - return null; - } - toNumeral(indices[0]); - toNumeral(indices[1]); - return re; - } - }); - if (mLogic.hasIntegers()) { - final Sort[] int1 = new Sort[] { mNumericSort }; - final Sort[] str_int = new Sort[] { str, mNumericSort }; - final Sort[] str2_int = new Sort[] { str, str, mNumericSort }; - final Sort[] str_int2 = new Sort[] { str, mNumericSort, mNumericSort }; - declareInternalFunction(SMTLIBConstants.STR_LEN, str1, mNumericSort, 0); - declareInternalFunction(SMTLIBConstants.STR_AT, str_int, str, 0); - declareInternalFunction(SMTLIBConstants.STR_SUBSTR, str_int2, str, 0); - declareInternalFunction(SMTLIBConstants.STR_INDEXOF, str2_int, mNumericSort, 0); - declareInternalFunction(SMTLIBConstants.STR_TO_CODE, str1, mNumericSort, 0); - declareInternalFunction(SMTLIBConstants.STR_FROM_CODE, int1, str, 0); - declareInternalFunction(SMTLIBConstants.STR_TO_INT, str1, mNumericSort, 0); - declareInternalFunction(SMTLIBConstants.STR_FROM_INT, int1, str, 0); - } - } - - private void setLogic(final Logics logic) { - mLogic = logic; - - if (logic.isArray()) { - createArrayOperators(); - } - - if (logic.hasReals() || logic.isFloatingPoint()) { - mRealSort = declareInternalSort("Real", 0, SortSymbol.NUMERIC).getSort(null, new Sort[0]); - } - - if (logic.isArithmetic() || logic.isBitVector()) { - - if (logic.hasIntegers() || logic.isBitVector()) { - mNumericSort = declareInternalSort("Int", 0, SortSymbol.NUMERIC).getSort(null, new Sort[0]); - } else { - mNumericSort = mRealSort; - } - - if (logic.isIRA() || (logic.isBitVector() && logic.hasReals())) { - createIRAOperators(); - } else { - createNumericOperators(mNumericSort, logic.hasReals()); - } - } - - if (logic.isBitVector() || logic.isFloatingPoint()) { - createBitVecSort(); - } - - if (logic.isBitVector()) { - createBitVecOperators(); - } - - if (logic.isFloatingPoint()) { - createFloatingPointOperators(); - } - - if (logic.isString()) { - createStringOperators(); - } - if (mSolverSetup != null) { - mSolverSetup.setLogic(this, logic); - } - if (logic.isDatatype()) { - declareInternalFunctionFactory(new IsConstructorFactory()); - } - } - - /******************** SORTS ********************************************/ - - private SortSymbol defineSort(final String name, final int paramCount, final Sort definition, final int flags) { - if ((flags & FunctionSymbol.INTERNAL) == 0 && definition == null && !mLogic.isUF() && !mLogic.isArray()) { - throw new IllegalArgumentException("Free sorts are not allowed in this logic"); - } - SortSymbol sortsym = mDeclaredSorts.get(name); - if (sortsym != null) { - throw new IllegalArgumentException("Sort " + name + " already exists."); - } - sortsym = new SortSymbol(this, name, paramCount, definition, flags); - mDeclaredSorts.put(name, sortsym); - return sortsym; - } - - public SortSymbol declareSort(final String name, final int paramCount) { - return defineSort(name, paramCount, null, 0); - } - - public SortSymbol defineSort(final String name, final int paramCount, final Sort definition) { - return defineSort(name, paramCount, definition, 0); - } - - public Sort[] createSortVariables(final String... names) { - final Sort[] sorts = new Sort[names.length]; - for (int i = 0; i < names.length; i++) { - sorts[i] = new SortSymbol(this, names[i], i, null, SortSymbol.TYPEPARAM).getSort(null, new Sort[0]); - } - return sorts; - } - - public SortSymbol declareInternalSort(final String name, final int paramCount, final int flags) { - return defineSort(name, paramCount, null, flags | SortSymbol.INTERNAL); - } - - /** - * Returns the sort object for a previously declared or defined sort with sort arguments. - * - * @param id - * The name of the sort. - * @param args - * The sort arguments. - * @return the sort object. - */ - public Sort getSort(final String id, final Sort... args) { - return getSort(id, null, args); - } - - /** - * Returns the sort object for a previously declared or defined sort with sort arguments. - * - * @param id - * The name of the sort. - * @param args - * The sort arguments. - * @return the sort object. - */ - public Sort getSort(final String id, final String[] indices, final Sort... args) { - SortSymbol symbol; - symbol = mDeclaredSorts.get(id); - if (symbol == null) { - return null; - } - return symbol.getSort(indices, args); - } - - /** - * Returns the Boolean sort. This is more efficient but has the same effect as calling getSort("Bool"). - * - * @return the Boolean sort. - */ - public Sort getBooleanSort() { - return mBooleanSort; - } - - /** - * Get the sort used to construct integers. Note that this returns null if the logic does not support - * integers. - * - * @return Sort used for integers. - */ - public Sort getNumericSort() { - return mNumericSort; - } - - /** - * Get the sort used to construct reals. Note that this returns null if the logic does not support - * reals. - * - * @return Sort used for reals. - */ - public Sort getRealSort() { - return mRealSort; - } - - /** - * Get the sort used to construct strings. Note that this returns null if the logic does not support - * strings. - * - * @return Sort used for strings. - */ - public Sort getStringSort() { - return mStringSort; - } - - /******************** FUNCTIONS SYMBOLS AND FUNCTION TERMS ************/ - - public void declareInternalFunctionFactory(final FunctionSymbolFactory factory) { - if (mFunFactory.put(factory.mFuncName, factory) != null) { - throw new AssertionError(); - } - } - - private FunctionSymbol defineFunction(final String name, Sort[] paramTypes, final Sort resultType, - TermVariable[] definitionVars, final Term definition, final int flags) { - if ((flags & FunctionSymbol.INTERNAL) == 0) { - if (mLogic == null) { - throw new IllegalArgumentException("Call set-logic first!"); - } - if (!mLogic.isUF() && paramTypes.length > 0 && definition == null) { - throw new IllegalArgumentException("Free functions are not allowed in this logic!"); - } - } - if (name.charAt(0) == '@' && name.matches(MODEL_VALUE_PATTERN)) { - throw new IllegalArgumentException("Function " + name + " is reserved for internal purposes."); - } - if (mFunFactory.get(name) != null || mDeclaredFuns.get(name) != null) { - throw new IllegalArgumentException("Function " + name + " is already defined."); - } - if (paramTypes.length == 0) { - paramTypes = EMPTY_SORT_ARRAY; - } - if (definitionVars != null && definitionVars.length == 0) { - definitionVars = EMPTY_TERM_VARIABLE_ARRAY; - } - final FunctionSymbol f = - new FunctionSymbol(name, null, paramTypes, resultType, definitionVars, definition, flags); - mDeclaredFuns.put(name, f); - return f; - } - - /** - * Declare a new function symbol. This corresponds to declare-fun in SMTLIB. - * - * @param name - * name of the function. - * @param paramTypes - * the sorts of the parameters of the function. - * @param resultType - * the sort of the result type of the function. - * @throws IllegalArgumentException - * if a function with that name is already defined or if the sorts are not visible in this scope. - * @return the created function symbol. - */ - public FunctionSymbol declareFunction(final String name, final Sort[] paramTypes, final Sort resultType) { - return defineFunction(name, paramTypes, resultType, null, null, 0); - } - - /** - * Defines a new function symbol. This corresponds to define-fun in SMTLIB. - * - * @param name - * name of the function. - * @param definitionVars - * the variables of the function. - * @param definition - * the definition of the function. - * @throws IllegalArgumentException - * if a function with that name is already defined or if the sorts are not visible in this scope. - * @return the created function symbol. - */ - public FunctionSymbol defineFunction(final String name, final TermVariable[] definitionVars, - final Term definition) { - final Sort[] paramTypes = definitionVars.length == 0 ? EMPTY_SORT_ARRAY : new Sort[definitionVars.length]; - for (int i = 0; i < paramTypes.length; i++) { - paramTypes[i] = definitionVars[i].getSort(); - } - final Sort resultType = definition.getSort(); - return defineFunction(name, paramTypes, resultType, definitionVars, definition, 0); - } - - public FunctionSymbol getFunction(final String name, final Sort... paramTypes) { - return getFunctionWithResult(name, null, null, paramTypes); - } - - public Map getDeclaredFunctions() { - return mDeclaredFuns; - } - - public Map getDeclaredSorts() { - return mDeclaredSorts; - } - - public Map getFunctionFactories() { - return mFunFactory; - } - - private FunctionSymbol getModelValueSymbol(final String name, final Sort sort) { - final int hash = HashUtils.hashJenkins(name.hashCode(), sort); - for (final FunctionSymbol symb : mModelValueCache.iterateHashCode(hash)) { - if (symb.getName().equals(name) && symb.getReturnSort() == sort) { - return symb; - } - } - final FunctionSymbol symb = new FunctionSymbol(name, null, EMPTY_SORT_ARRAY, sort, null, null, - FunctionSymbol.RETURNOVERLOAD | FunctionSymbol.INTERNAL | FunctionSymbol.MODELVALUE); - mModelValueCache.put(hash, symb); - return symb; - } - - public FunctionSymbol getFunctionWithResult(final String name, final String[] indices, final Sort resultType, - final Sort... paramTypes) { - final FunctionSymbolFactory factory = mFunFactory.get(name); - if (factory != null) { - FunctionSymbol fsym = factory.getFunctionWithResult(this, indices, paramTypes, resultType); - if (fsym == null && mIRAWrappers != null) { - fsym = mIRAWrappers.createWrapper(this, name, indices, paramTypes, resultType); - } - if (fsym == null) { - final StringBuilder sb = new StringBuilder(); - final PrintTerm pt = new PrintTerm(); - sb.append("Builtin function "); - if (indices != null) { - sb.append("(_ ").append(name); - for (final String i : indices) { - sb.append(" ").append(i); - } - sb.append(") does not support indices or argument sorts ("); - } else { - sb.append(name); - sb.append(" does not support argument sorts ("); - } - String sep = ""; - for (final Sort s : paramTypes) { - sb.append(sep); - pt.append(sb, s); - sep = " "; - } - sb.append(")"); - throw new SMTLIBException(sb.toString()); - } - return fsym; - } - FunctionSymbol fsym = mDeclaredFuns.get(name); - if (fsym != null) { - if (indices != null) { - throw new SMTLIBException("Function " + name + " take no index."); - } - if (resultType != null || !fsym.typecheck(paramTypes)) { - if (mIRAWrappers != null) { - fsym = mIRAWrappers.createWrapper(this, name, indices, paramTypes, resultType); - if (fsym != null) { - return fsym; - } - } - throw new SMTLIBException( - "Application of function " + fsym + " does not type check."); - } - return fsym; - } - if (resultType != null && indices == null && paramTypes.length == 0 && name.matches(MODEL_VALUE_PATTERN)) { - return getModelValueSymbol(name, resultType); - } - throw new SMTLIBException("Unknown function symbol " + name + "."); - } - - public Term term(final FunctionSymbolFactory factory, final Term... parameters) { - final Sort[] sorts = parameters.length == 0 ? EMPTY_SORT_ARRAY : new Sort[parameters.length]; - for (int i = 0; i < parameters.length; i++) { - sorts[i] = parameters[i].getSort(); - } - final FunctionSymbol fsym = factory.getFunctionWithResult(this, null, sorts, null); - if (fsym == null) { - throw new IllegalArgumentException("Did not find overload for function " + factory); - } - return term(fsym, parameters); - } - - public Term term(final String funcname, final String[] indices, - final Sort returnSort, final Term... params) throws SMTLIBException { - if (mBitVecSort != null && indices != null && indices.length == 1 && returnSort == null && params.length == 0 - && funcname.matches(BITVEC_CONST_PATTERN) && indices[0].matches("\\d+")) { - final BigInteger value = new BigInteger(funcname.substring(2)); - if (value.bitLength() > Integer.parseInt(indices[0])) { - throw new SMTLIBException("Constant out of range: (_ " + funcname + " " + indices[0] + ")"); - } - return constant(value, mBitVecSort.getSort(indices)); - } - - final Sort[] sorts = params.length == 0 ? Script.EMPTY_SORT_ARRAY : new Sort[params.length]; - for (int i = 0; i < sorts.length; i++) { - sorts[i] = params[i].getSort(); - } - final FunctionSymbol fsym = getFunctionWithResult(funcname, indices, returnSort, sorts); - return term(fsym, params); - } - - public Term term(final String func, final Term... parameters) { - return term(func, null, null, parameters); - } - - public Term term(final FunctionSymbol func, Term... parameters) { - // Special case for normalizing rationals: we want to use ConstantValue with Rational, for things - // like (/ 1.0 2.0), to avoid the overhead of parsing them again. To avoid two terms that look identical but are - // not equal, we don't create an ApplicationTerm when parsing rational constants. - if (func.isIntern() && func.getName().equals(SMTLIBConstants.DIVIDE) && parameters.length == 2 - && parameters[0] instanceof ConstantTerm && parameters[1] instanceof ConstantTerm - && parameters[0].getSort() == getRealSort() && parameters[1].getSort() == getRealSort()) { - final ConstantTerm numTerm = (ConstantTerm) parameters[0]; - final ConstantTerm denomTerm = (ConstantTerm) parameters[1]; - BigInteger num = null, denom = null; - if (numTerm.getValue() instanceof Rational && denomTerm.getValue() instanceof Rational) { - final Rational numRat = (Rational) numTerm.getValue(); - final Rational denomRat = (Rational) denomTerm.getValue(); - if (numRat.isIntegral() && denomRat.isIntegral()) { - num = numRat.numerator(); - denom = denomRat.numerator(); - } - } - // make sure that num and denom have the right form such that the created - // rational term would be completely identical - if (num != null && denom.compareTo(BigInteger.ONE) > 0 && num.gcd(denom).equals(BigInteger.ONE)) { - final Rational value = Rational.valueOf(num, denom); - return constant(value, getRealSort()); - } - } - if (func.isIntern() && func.getName().equals(SMTLIBConstants.MINUS) && parameters.length == 1 - && parameters[0] instanceof ConstantTerm - && (parameters[0].getSort() == getNumericSort() || parameters[0].getSort() == getRealSort())) { - final ConstantTerm numTerm = (ConstantTerm) parameters[0]; - if (numTerm.getValue() instanceof Rational) { - final Rational num = (Rational) numTerm.getValue(); - // make sure that num has the right form. In particular we only allow negating integrals, as the - // normal form of -.5 is (/ (- 1.0) 2.0). - if (num.isIntegral() && num.signum() > 0) { - return constant(num.negate(), numTerm.getSort()); - } - } else if (numTerm.getValue() instanceof BigInteger) { - final BigInteger num = (BigInteger) numTerm.getValue(); - // make sure that num is positive. - if (num.signum() > 0) { - return constant(num.negate(), numTerm.getSort()); - } - } - } - - // Not a rational term to normalize - if (parameters.length == 0) { - parameters = EMPTY_TERM_ARRAY; - } - final int hash = ApplicationTerm.hashApplication(func, parameters); - for (final Term t : mTermCache.iterateHashCode(hash)) { - if (t instanceof ApplicationTerm) { - final ApplicationTerm app = (ApplicationTerm) t; - if (func == app.getFunction() && Arrays.equals(app.getParameters(), parameters)) { - return app; - } - } - } - final ApplicationTerm app = new ApplicationTerm(func, parameters, hash); - mTermCache.put(hash, app); - return app; - } - - /******************** TERM VARIABLES AND VARIABLE TERMS *****************/ - - /** - * Create a fresh term variable that does not clash with any existing one. - * - * @param prefix - * the prefix of the variable name (without the leading ?). - * @param sort - * the sort of the variable. - * @return a fresh term variable. - */ - public TermVariable createFreshTermVariable(final String prefix, final Sort sort) { - final String name = "." + prefix + "." + mTvarCtr++; - return new TermVariable(name, sort, TermVariable.hashVariable(name, sort)); - } - - /** - * Create a term variable with the given name and sort. - * - * @param name - * the variable name. - * @param sort - * the sort of the variable. - * @return a term variable. - */ - public TermVariable createTermVariable(final String name, final Sort sort) { - final int hash = TermVariable.hashVariable(name, sort); - for (final TermVariable tv : mTvUnify.iterateHashCode(hash)) { - if (tv.getSort().equals(sort) && tv.getName().equals(name)) { - return tv; - } - } - final TermVariable tv = new TermVariable(name, sort, hash); - mTvUnify.put(hash, tv); - return tv; - } - - public DataType.Constructor createConstructor(final String name, final String[] selectors, - final Sort[] argumentSorts) { - final DataType.Constructor constructor = new DataType.Constructor(name, selectors, argumentSorts); - return constructor; - - } - - /** - * Create a new data type with the given name and number of parameters. - * - * @param name - * the variable name. - * @param numParams - * the number of parameters of the data type. - * @return a data type. - */ - public DataType createDatatypes(final String name, final int numParams) { - if (mDeclaredSorts.containsKey(name)) { - throw new SMTLIBException("Datatype " + name + " already exists."); - } - final DataType datatype = new DataType(this, name, numParams); - mDeclaredSorts.put(name, datatype); - return datatype; - } - - public Term term(final TermVariable var) { - return var; - } - - /******************** ANNOTATED TERMS *********************************/ - - public Term annotatedTerm(final Annotation[] annots, final Term sub) { - final int hash = AnnotatedTerm.hashAnnotations(annots, sub); - for (final Term t : mTermCache.iterateHashCode(hash)) { - if (t instanceof AnnotatedTerm) { - final AnnotatedTerm annot = (AnnotatedTerm) t; - if (sub == annot.getSubterm() && Arrays.equals(annot.getAnnotations(), annots)) { - return annot; - } - } - } - final AnnotatedTerm annot = new AnnotatedTerm(annots, sub, hash); - mTermCache.put(hash, annot); - return annot; - } - - /******************** ASSERTION STACK *********************************/ - - public void push() { - if (!mGlobalDecls) { - mFunFactory.beginScope(); - mDeclaredFuns.beginScope(); - mDeclaredSorts.beginScope(); - } - } - - public void pop() { - if (!mGlobalDecls) { - mFunFactory.endScope(); - mDeclaredFuns.endScope(); - mDeclaredSorts.endScope(); - } - } - - /** - * Create a fresh auxiliary function that stands for the given term and takes the given variables as arguments. - */ - public FunctionSymbol createFreshAuxFunction(final TermVariable[] vars, final Term term) { - final Sort[] paramSorts = new Sort[vars.length]; - for (int i = 0; i < vars.length; i++) { - paramSorts[i] = vars[i].getSort(); - } - return declareInternalFunction("@AUX" + (mAuxCounter++), paramSorts, vars, term, - FunctionSymbol.UNINTERPRETEDINTERNAL); // TODO Change flag? - } - - public void resetAssertions() { - if (mGlobalDecls) { - return; - } - while (mDeclaredFuns.getActiveScopeNum() > 1) { - mDeclaredFuns.endScope(); - } - for (final Iterator> it = mDeclaredFuns.entrySet().iterator(); it - .hasNext();) { - final Map.Entry next = it.next(); - if (!next.getValue().isIntern()) { - it.remove(); - } - } - while (mFunFactory.getActiveScopeNum() > 1) { - mFunFactory.endScope(); - } - while (mDeclaredSorts.getActiveScopeNum() > 1) { - mDeclaredSorts.endScope(); - } - for (final Iterator> it = mDeclaredSorts.entrySet().iterator(); it.hasNext();) { - final Map.Entry next = it.next(); - if (!next.getValue().isIntern()) { - it.remove(); - } - } - } - - public void setGlobalSymbols(final boolean globalDecls) { - mGlobalDecls = globalDecls; - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Util.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Util.java deleted file mode 100644 index 3571d83b585..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/Util.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (C) 2009-2012 University of Freiburg - * - * This file is part of SMTInterpol. - * - * SMTInterpol is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * SMTInterpol is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with SMTInterpol. If not, see . - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.util.LinkedHashSet; - -import de.uni_freiburg.informatik.ultimate.logic.Script.LBool; - -/** - * This class contains some static methods to help creating terms, checking formulas, etc. - * - * @author christ, heizmann, hoenicke - */ -public final class Util { - - private Util() { - // Prevent instantiation of this utility class - } - - /** - * Check if {@code term} which may contain free {@code TermVariables} is satisfiable with respect to the current - * assertion stack of {@code script}. Only the result from this function can be used since the assertion stack will - * be modified after leaving this function. - * - * @param script - * the script used to run the check. - * @param term - * the term to check for satisfiability (possibly containing free variables). - * @return the satisfiability status (SAT, UNSAT or UNKNOWN). - */ - public static LBool checkSat(final Script script, Term term) { - script.push(1); - Throwable checkSatException = null; - SMTLIBException popException = null; - LBool result = null; - try { - final TermVariable[] vars = term.getFreeVars(); - final Term[] values = new Term[vars.length]; - for (int i = 0; i < vars.length; i++) { - values[i] = termVariable2constant(script, vars[i]); - } - term = script.let(vars, values, term); - result = script.assertTerm(term); - if (result == LBool.UNKNOWN) { - result = script.checkSat(); - } - } catch (final Throwable e) { - checkSatException = e; - } finally { - try { - script.pop(1); - } catch (final SMTLIBException e) { - popException = e; - } - } - - // ignore popException and throw the check-sat exception - if (checkSatException != null) { - if (checkSatException instanceof SMTLIBException) { - throw (SMTLIBException) checkSatException; - } - throw new RuntimeException(checkSatException); - } else if (popException != null) { - throw popException; - } else { - return result; - } - } - - private static Term termVariable2constant(final Script script, final TermVariable tv) { - final String name = tv.getName() + "_const_" + tv.hashCode(); - final Sort resultSort = tv.getSort(); - script.declareFun(name, Script.EMPTY_SORT_ARRAY, resultSort); - return script.term(name); - } - - /** - * Return slightly simplified version of (not f). It removes double negation and simplifies (not true) and (not - * false). - * - * @param script - * the Script used to build terms. - * @param f - * the term to negate - * @return a term logically equivalent to (not f). - */ - public static Term not(final Script script, final Term f) { - if (f == script.term("true")) { - return script.term("false"); - } - if (f == script.term("false")) { - return script.term("true"); - } - if (f instanceof ApplicationTerm && ((ApplicationTerm) f).getFunction().getName().equals("not")) { - return ((ApplicationTerm) f).getParameters()[0]; - } - return script.term("not", f); - } - - /** - * Return slightly simplified version of (and subforms). It removes parameters occuring multiple times, true and - * false. It also handles the case where there is only one or zero subformulas. - * - * @param script - * the Script used to build terms. - * @param subforms - * the sub formulas that are conjoined. - * @return a term logically equivalent to (and subforms). - */ - public static Term and(final Script script, final Term... subforms) { - return simplifyAndOr(script, "and", subforms); - } - - /** - * Return slightly simplified version of (or subforms). It removes parameters occuring multiple times, true and - * false. It also handles the case where there is only one or zero subformulas. - * - * @param script - * the Script used to build terms. - * @param subforms - * the sub formulas that are disjoined. - * @return a term logically equivalent to (or subforms). - */ - public static Term or(final Script script, final Term... subforms) { - return simplifyAndOr(script, "or", subforms); - } - - private static Term simplifyAndOr(final Script script, final String connector, final Term... subforms) { - final Term trueTerm = script.term("true"); - final Term falseTerm = script.term("false"); - Term neutral, absorbing; - if (connector.equals("and")) { - neutral = trueTerm; - absorbing = falseTerm; - } else { - neutral = falseTerm; - absorbing = trueTerm; - } - final LinkedHashSet formulas = new LinkedHashSet<>(); - - for (final Term f : subforms) { - if (f == neutral) { - continue; - } - if (f == absorbing) { - return f; - } - - /* Normalize nested and/ors */ - if (f instanceof ApplicationTerm && ((ApplicationTerm) f).getFunction().getName().equals(connector)) { - for (final Term subf : ((ApplicationTerm) f).getParameters()) { - formulas.add(subf); - } - } else { - formulas.add(f); - } - } - if (formulas.size() <= 1) { // NOPMD - if (formulas.isEmpty()) { - return neutral; - } - return formulas.iterator().next(); - } - final Term[] arrforms = formulas.toArray(new Term[formulas.size()]); - return script.term(connector, arrforms); - } - - /** - * Create a slightly simplified if-then-else term. This mainly optimizes the special cases where one of the - * parameters is true or false. - * - * @param script - * the script where the term is created. - * @param cond - * the if condition. - * @param thenPart - * the then part. - * @param elsePart - * the else part. - * @return the simplified if-then-else term. - */ - public static Term ite(final Script script, final Term cond, final Term thenPart, final Term elsePart) { - final Term trueTerm = script.term("true"); - final Term falseTerm = script.term("false"); - if (cond == trueTerm || thenPart == elsePart) { - return thenPart; - } else if (cond == falseTerm) { - return elsePart; - } else if (thenPart == trueTerm) { - return Util.or(script, cond, elsePart); - } else if (elsePart == falseTerm) { - return Util.and(script, cond, thenPart); - } else if (thenPart == falseTerm) { - return Util.and(script, Util.not(script, cond), elsePart); - } else if (elsePart == trueTerm) { - return Util.or(script, Util.not(script, cond), thenPart); - } - return script.term("ite", cond, thenPart, elsePart); - } - - /** - * Create a slightly simplified implies term. This mainly optimizes the special cases where one of the parameters is - * true or false or if a left-hand-side term occurs more than once. It also handles the case where only one - * subformula is given. - * - * @param script - * the script where the term is created. - * @param subforms - * the sub formulas. - * @return A simplified version of (=> subforms...). - */ - public static Term implies(final Script script, final Term... subforms) { - final Term trueTerm = script.term("true"); - final Term lastFormula = subforms[subforms.length - 1]; - if (lastFormula == trueTerm) { - return trueTerm; - } - final Term falseTerm = script.term("false"); - if (lastFormula == falseTerm) { - final Term[] allButLast = new Term[subforms.length - 1]; - System.arraycopy(subforms, 0, allButLast, 0, subforms.length - 1); - return Util.not(script, Util.and(script, allButLast)); - } - final LinkedHashSet newSubforms = new LinkedHashSet<>(); - for (int i = 0; i < subforms.length - 1; i++) { - if (subforms[i] == falseTerm) { - return trueTerm; - } - if (subforms[i] != trueTerm) { - newSubforms.add(subforms[i]); - } - } - if (newSubforms.isEmpty()) { - return lastFormula; - } - final Term[] newParams = newSubforms.toArray(new Term[newSubforms.size() + 1]); - newParams[newParams.length - 1] = lastFormula; - return script.term("=>", newParams); - } -} diff --git a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/WrapperScript.java b/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/WrapperScript.java deleted file mode 100644 index 19555bc30f8..00000000000 --- a/trunk/source/Library-SMTLIB/src/de/uni_freiburg/informatik/ultimate/logic/WrapperScript.java +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright (C) 2018 Matthias Heizmann (heizmann@informatik.uni-freiburg.de) - * Copyright (C) 2018 University of Freiburg - * - * This file is part of the ULTIMATE ModelCheckerUtils Library. - * - * The ULTIMATE ModelCheckerUtils Library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The ULTIMATE ModelCheckerUtils Library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the ULTIMATE ModelCheckerUtils Library. If not, see . - * - * Additional permission under GNU GPL version 3 section 7: - * If you modify the ULTIMATE ModelCheckerUtils Library, or any covered work, by linking - * or combining it with Eclipse RCP (or a modified version of Eclipse RCP), - * containing parts covered by the terms of the Eclipse Public License, the - * licensors of the ULTIMATE ModelCheckerUtils Library grant you additional permission - * to convey the resulting work. - */ -package de.uni_freiburg.informatik.ultimate.logic; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; - -/** - * Base class for implementing wrapping scripts. - * - * @author Daniel Dietsch (dietsch@informatik.uni-freiburg.de) - * - */ -public class WrapperScript implements Script { - - protected final Script mScript; - - protected WrapperScript(final Script wrappedScript) { - mScript = Objects.requireNonNull(wrappedScript); - } - - /** - * Find the first {@link Script} instance that has the given type or is a subtype of the given type in the stack of - * {@link Script} instances represented by this {@link WrapperScript}. - * - * @param - * The type of {@link Script} to search for. - * @param clazz - * The {@link Class} instance representing the type. - * @return A {@link Script} instance if one can be found or null. - */ - @SuppressWarnings("unchecked") - public T findBacking(final Class clazz) { - final Iterator