New KeY Version and modification of interface acc. to new version; corrected Sysouts;

rt-key/src/main/java/edu/kit/iti/formal/psdbg/ValueInjector.java

@@ -251,7 +251,7 @@ public class ValueInjector {
                 try {
                     t = tc.convert(userinput);
                 } catch (ParserException pe) {
-                    System.out.println("edu/kit/iti/formal/psdbg/ValueInjector.java:250 ParserException");
+                    //System.out.println("edu/kit/iti/formal/psdbg/ValueInjector.java:250 ParserException");
                     throw new ArgumentRequiredException(
                             String.format("Argument %s:%s is required, but %s was given. " +
                                             "For comamnd class: '%s'",

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/matcher/KeYMatcher.java

@@ -8,10 +8,10 @@ import de.uka.ilkd.key.logic.op.LogicVariable;
 import de.uka.ilkd.key.logic.op.SchemaVariable;
 import de.uka.ilkd.key.parser.ParserException;
 import de.uka.ilkd.key.pp.LogicPrinter;
-import de.uka.ilkd.key.proof.ApplyStrategy;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.proof.init.Profile;
+import de.uka.ilkd.key.prover.impl.ApplyStrategy;
 import de.uka.ilkd.key.rule.NoPosTacletApp;
 import de.uka.ilkd.key.rule.Taclet;
 import de.uka.ilkd.key.rule.TacletApp;

rt-key/src/test/java/edu/kit/iti/formal/psdbg/interpreter/ExecuteTest.java

@@ -115,6 +115,7 @@ public class ExecuteTest {
 
         Interpreter<KeyData> run = exec.run();
         Assert.assertTrue(run.getCurrentGoals().isEmpty());
+        System.out.println("The proof of Quicksorts split method was closed");
     }
 
 }
\ No newline at end of file

rt-key/src/test/resources/edu/kit/iti/formal/psdbg/interpreter/javaTestFiles/quicksort/problem.key

-// This file is part of KeY - Integrated Deductive Software Design
-//
-// Copyright (C) 2001-2011 Universitaet Karlsruhe (TH), Germany
-//                         Universitaet Koblenz-Landau, Germany
-//                         Chalmers University of Technology, Sweden
-// Copyright (C) 2011-2013 Karlsruhe Institute of Technology, Germany
-//                         Technical University Darmstadt, Germany
-//                         Chalmers University of Technology, Sweden
-//
-// The KeY system is protected by the GNU General
-// Public License. See LICENSE.TXT for details.
-//
+\settings{
+"#Proof-Settings-Config-File
+[StrategyProperty]OSS_OPTIONS_KEY=OSS_ON
+[StrategyProperty]VBT_PHASE=VBT_SYM_EX
+[SMTSettings]useUninterpretedMultiplication=true
+[SMTSettings]SelectedTaclets=
+[StrategyProperty]METHOD_OPTIONS_KEY=METHOD_CONTRACT
+[StrategyProperty]USER_TACLETS_OPTIONS_KEY3=USER_TACLETS_OFF
+[StrategyProperty]SYMBOLIC_EXECUTION_ALIAS_CHECK_OPTIONS_KEY=SYMBOLIC_EXECUTION_ALIAS_CHECK_NEVER
+[StrategyProperty]LOOP_OPTIONS_KEY=LOOP_INVARIANT
+[StrategyProperty]USER_TACLETS_OPTIONS_KEY2=USER_TACLETS_OFF
+[StrategyProperty]USER_TACLETS_OPTIONS_KEY1=USER_TACLETS_OFF
+[StrategyProperty]QUANTIFIERS_OPTIONS_KEY=QUANTIFIERS_NON_SPLITTING_WITH_PROGS
+[StrategyProperty]NON_LIN_ARITH_OPTIONS_KEY=NON_LIN_ARITH_NONE
+[SMTSettings]instantiateHierarchyAssumptions=true
+[StrategyProperty]AUTO_INDUCTION_OPTIONS_KEY=AUTO_INDUCTION_OFF
+[StrategyProperty]DEP_OPTIONS_KEY=DEP_ON
+[StrategyProperty]CLASS_AXIOM_OPTIONS_KEY=CLASS_AXIOM_FREE
+[StrategyProperty]SYMBOLIC_EXECUTION_NON_EXECUTION_BRANCH_HIDING_OPTIONS_KEY=SYMBOLIC_EXECUTION_NON_EXECUTION_BRANCH_HIDING_OFF
+[StrategyProperty]QUERY_NEW_OPTIONS_KEY=QUERY_OFF
+[Strategy]Timeout=-1
+[Strategy]MaximumNumberOfAutomaticApplications=10000
+[SMTSettings]integersMaximum=2147483645
+[Choice]DefaultChoices=assertions-assertions\:safe , initialisation-initialisation\:disableStaticInitialisation , intRules-intRules\:arithmeticSemanticsIgnoringOF , programRules-programRules\:Java , runtimeExceptions-runtimeExceptions\:allow , JavaCard-JavaCard\:off , Strings-Strings\:on , modelFields-modelFields\:treatAsAxiom , bigint-bigint\:on , sequences-sequences\:on , moreSeqRules-moreSeqRules\:on , reach-reach\:on , integerSimplificationRules-integerSimplificationRules\:full , permissions-permissions\:off , wdOperator-wdOperator\:L , wdChecks-wdChecks\:off , mergeGenerateIsWeakeningGoal-mergeGenerateIsWeakeningGoal\:off
+[SMTSettings]useConstantsForBigOrSmallIntegers=true
+[StrategyProperty]STOPMODE_OPTIONS_KEY=STOPMODE_DEFAULT
+[StrategyProperty]QUERYAXIOM_OPTIONS_KEY=QUERYAXIOM_ON
+[StrategyProperty]INF_FLOW_CHECK_PROPERTY=INF_FLOW_CHECK_FALSE
+[SMTSettings]maxGenericSorts=2
+[SMTSettings]integersMinimum=-2147483645
+[SMTSettings]invariantForall=false
+[SMTSettings]UseBuiltUniqueness=false
+[SMTSettings]explicitTypeHierarchy=false
+[Strategy]ActiveStrategy=JavaCardDLStrategy
+[StrategyProperty]SPLITTING_OPTIONS_KEY=SPLITTING_DELAYED
+[StrategyProperty]MPS_OPTIONS_KEY=MPS_MERGE"}
 
 \javaSource "./";
 

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/Interpreter.java

@@ -148,7 +148,7 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
         Variable var = assignmentStatement.getLhs();
         Expression expr = assignmentStatement.getRhs();
         if (t != null) {
-            System.out.println("t = " + t+ var);
+           // System.out.println("t = " + t+ var);
             node.declareVariable(var, t);
         }
 
@@ -161,7 +161,7 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
                 if (fireVariableAssignmentHook(node, var.getIdentifier(), v)) {
                     node.setVariableValue(var, v);
                 }
-                System.out.println("v = " + v);
+                //System.out.println("v = " + v);
                 node.setVariableValue(var, v);
             }
         }

ui/src/main/java/de/uka/ilkd/key/macros/TestGenMacro.java

@@ -6,7 +6,7 @@ import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Node;
 import de.uka.ilkd.key.proof.Proof;
-import de.uka.ilkd.key.proof.ProverTaskListener;
+import de.uka.ilkd.key.prover.ProverTaskListener;
 import org.key_project.util.collection.ImmutableList;
 
 public class TestGenMacro implements ProofMacro {
@@ -30,6 +30,21 @@ public class TestGenMacro implements ProofMacro {
         return null;
     }
 
+    @Override
+    public boolean hasParameter(String s) {
+        return false;
+    }
+
+    @Override
+    public void setParameter(String s, String s1) throws IllegalArgumentException {
+
+    }
+
+    @Override
+    public void resetParams() {
+
+    }
+
     @Override
     public boolean canApplyTo(Proof proof, ImmutableList<Goal> immutableList, PosInOccurrence posInOccurrence) {
         return false;

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java

@@ -289,6 +289,7 @@ public class InteractiveModeController {
         } catch (ScriptCommandNotApplicableException e) {
             StringBuilder sb = new StringBuilder("The macro command ");
             sb.append(call.getCommand()).append(" was not applicable.");
+            LOGGER.error(e);
             System.out.println("e = " + e);
             //sb.append("\nSequent Formula: formula=").append(sfTerm);
             //sb.append("\nOn Sub Term: on=").append(onTerm);