DId few minor clean ups

unnecessary classes removed
calling functions adjusted

But now StpSolverTest gives a Segfault

Author: refactormyself

src/org/sosy_lab/java_smt/native_api/stp/Testing.java

@@ -26,6 +26,9 @@
 import org.sosy_lab.common.log.LogManager;
 
 /**
+ * TODO use the class to settings or config OR BETTER DELETE IT
+ *
+ *
  * This class is the actual Wrapper around an STP "context" known over there as Validity Checker All
  * "context" related operations are handled here Flags, SAT solver settings, STP "environment"
  * variables are handled here

src/org/sosy_lab/java_smt/native_api/stp/package-info.java

@@ -50,7 +50,7 @@ public class StpFormulaCreator extends FormulaCreator<Long, Long, Long, Long> {
   private final VC vc;
 
   protected StpFormulaCreator(VC vc) {
-    super(StpVC.getVCptr(vc), Type.getCPtr(StpJavaApi.vc_boolType(vc)), null, null);
+    super(VC.getCPtr(vc), Type.getCPtr(StpJavaApi.vc_boolType(vc)), null, null);
     this.vc = vc;
   }
 
@@ -84,7 +84,7 @@ public Long makeVariable(Long pType, String pVarName) {
 
   @Override
   public FormulaType<?> getFormulaType(Long pFormula) {
-    // System.out.println("I came here.");
+
 //    long type = msat_term_get_type(pFormula);
 //    return getFormulaTypeFromTermType(type);
     // return null;

src/org/sosy_lab/java_smt/solvers/stp/StpEnvironment.java

@@ -24,26 +24,14 @@
 
 public class StpNativeApi {
 
-  private static StpJavaApi StpJavaApi;
-
   static String getStpVersion() {
     return org.sosy_lab.java_smt.solvers.stp.StpJavaApi.get_git_version_tag();
   }
 
 
   static long getStpBoolType(StpSolverContext context) throws Exception {
-    // ToDo: IMPLEMENT
-
-    // So everything needs to start with the SolverContext
-
-    // Create a SolverContext that will manage the life span of the VC object
-    // ...
-    // ...
-    // In this method I want to get a VC object (i.e. a SolverContext) and return
-    // the address of the boolType for that context
-    VC vc = null;
-    // Type type = stpJapi.vc_boolType(vc);
-    return StpType.getTypePtr(org.sosy_lab.java_smt.solvers.stp.StpJavaApi.vc_boolType(vc));
+    VC vc = context.getFormulaCreator().getVC();
+    return Type.getCPtr(org.sosy_lab.java_smt.solvers.stp.StpJavaApi.vc_boolType(vc));
   }
 
 }

src/org/sosy_lab/java_smt/solvers/stp/StpExpr.java

@@ -70,9 +70,6 @@ public static StpSolverContext create(
     }
 
     //Create or setup the 'environment' with supplied parameters and other java-smt defaults
-    StpEnvironment environ = // TODO: I got this wrong
-        new StpEnvironment(config, logger, shutdownNotifier, stpLogfile, randomSeed);
-
     vcStpContext = StpJavaApi.vc_createValidityChecker(); // this is the 'env'
 
     // use the 'environment' to create a FormulaCreator object
@@ -98,6 +95,10 @@ public static StpSolverContext create(
     return new StpSolverContext(formulaMgr, formulaCreator, logger);
   }
 
+  public StpFormulaCreator getFormulaCreator() {
+    return this.formulaCreator;
+  }
+
   @Override
   public String getVersion() {
     return StpNativeApi.getStpVersion();