Add files via upload

Author: MatthiasNickles

src/main/scala/delSAT.scala

@@ -11,50 +11,7 @@
 
 package diff
 
-import com.accelad.math.nilgiri.autodiff.{AbstractUnaryFunction, DifferentialFunction, DifferentialFunctionFactory, Variable}
+import com.accelad.math.nilgiri.autodiff.DifferentialFunctionFactory
 import com.accelad.math.nilgiri.{DoubleReal, DoubleRealFactory}
 
-class DifferentialFunctionFactoryStasp extends DifferentialFunctionFactory[DoubleReal](DoubleRealFactory.instance()) {
-
-  class SCAbstractUnaryFunction(iX: DifferentialFunction[DoubleReal]) extends AbstractUnaryFunction[DoubleReal](iX: DifferentialFunction[DoubleReal]) {
-
-    override def getValue: DoubleReal = new DoubleReal(getReal) //rNFactory.phi(arg().getValue())
-
-    override def getReal: Double = {
-
-      assert(false, "differential function phi() should not be called from prasp2")
-
-      val uncertainAtomIndex = arg().getReal.toInt // must be toAbsEli positive Eli
-
-      -1d // dummy
-
-    }
-
-    @deprecated override def diff(i_v: Variable[DoubleReal]): DifferentialFunction[DoubleReal] = { // subject to removal in one of the next versions of DelSAT
-
-      //prt("Diff phi wrt " + i_v + "...")
-
-      if (i_v.getName.stripPrefix("anyPwPrForAtom_").toDouble == arg().getValue().getReal)
-
-      // We are returning the partial derivative d/dx, where x = i_v is toAbsEli variable with name "anyPwPrForAtom_"+uai, with uai being the index
-      // of an uncertain atom ua. Since phi(uai) is defined as sum(probabilities of all pws where atom ua holds), the result is
-      // either 1 (if this sum is differentiated against the probability variable of any possible world where atom ua holds) or 0 (otherwise).
-
-        one
-
-      else
-
-        zero
-
-    }
-
-    override def toString: String = "phi(" + arg.toString + ")"
-
-    override def getFormula(variables: java.util.List[Variable[DoubleReal]]): String = "phi(" + arg.getFormula(variables) + ")"
-
-  }
-
-  def phi(iX /*index of a measured atom (not an eli(!), since we don't have elis yet when this function is generated)*/ :
-          DifferentialFunction[DoubleReal]) = new SCAbstractUnaryFunction(iX)
-
-}
+class DifferentialFunctionFactoryStasp extends DifferentialFunctionFactory[DoubleReal](DoubleRealFactory.instance()) { }

src/main/scala/diff/DifferentialFunctionFactoryStasp.scala

@@ -13,6 +13,8 @@
 
 import com.accelad.math.nilgiri.DoubleReal;
 import com.accelad.math.nilgiri.autodiff.DifferentialFunction;
+import com.accelad.math.nilgiri.autodiff.Variable;
+import scala.Int;
 
 import java.io.Serializable;
 
@@ -21,23 +23,24 @@ public class UncertainAtomsSeprt implements Serializable {  // for interoperabil
 
     public String parameterAtomsSeq[];
 
-    public String measuredAtomsSeq[];  // within delSAT, the set of measured atoms is considered to be identical to the set ofparameter atoms
-    // (whereas the called of delSAT might distinguish with them, e.g., for inductive logic programming / weight learning purposes)
+    public String measuredAtomsSeq[];
 
     public DifferentialFunction<DoubleReal> innerCostExpressionInstances[];
 
-    public String costFunAsPredicate; // null or an unary predicate with #c as argument
+    public scala.collection.mutable.HashMap<Int, Variable<DoubleReal>> eliToVariableInCostFunctions;
+
+    //public String costFunAsPredicate; // null or an unary predicate with #c as argument
 
     public UncertainAtomsSeprt(String parameterAtomsSeq[], String measuredAtomsSeq[], DifferentialFunction<DoubleReal> innerCostExpressionInstances[],
-                               String costFunAsPredicate) {
+                               scala.collection.mutable.HashMap<Int, Variable<DoubleReal>> eliToVariableInCostFunctions) {
 
         this.parameterAtomsSeq = parameterAtomsSeq;
 
         this.measuredAtomsSeq = measuredAtomsSeq;
 
         this.innerCostExpressionInstances = innerCostExpressionInstances;
 
-        this.costFunAsPredicate = costFunAsPredicate;
+        this.eliToVariableInCostFunctions = eliToVariableInCostFunctions;
 
     }