added dMethods to dependency testing

hpcc-systems · Jun 27, 2022 · 011fc6a · 011fc6a
1 parent 0e89aaf
commit 011fc6a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Probability.ecl b/Probability.ecl
@@ -106,9 +106,9 @@ EXPORT Probability(DATASET(NumericField) ds, SET OF STRING varNames) := MODULE
       *     Values less than .5 indicate probable independence.
       *     Values greater than .5 indicate probable dependence
       */
-    EXPORT DATASET(NumericField) Dependence(DATASET(ProbQuery) queries) := FUNCTION
+    EXPORT DATASET(NumericField) Dependence(DATASET(ProbQuery) queries, STRING dMethod='prob') := FUNCTION
         queries_D := DISTRIBUTE(queries, id);
-        deps := ProbSpace.Dependence(queries_D, PS);
+        deps := ProbSpace.Dependence(queries_D, dMethod, PS);
         deps_S := SORT(deps, id);
         RETURN deps_S;
     END;
@@ -125,9 +125,9 @@ EXPORT Probability(DATASET(NumericField) ds, SET OF STRING varNames) := MODULE
       *     targets are most likely independent.  0 indicates probable dependence.
       *
       */
-    EXPORT DATASET(NumericField) isIndependent(DATASET(ProbQuery) queries) := FUNCTION
+    EXPORT DATASET(NumericField) isIndependent(DATASET(ProbQuery) queries, STRING dMethod='prob') := FUNCTION
         queries_D := DISTRIBUTE(queries, id);
-        deps := ProbSpace.Dependence(queries_D, PS);
+        deps := ProbSpace.Dependence(queries_D, dMethod, PS);
         deps_B := PROJECT(deps, TRANSFORM(RECORDOF(LEFT),
                                     SELF.value := IF(LEFT.value > .5, 0, 1),
                                     SELF := LEFT), LOCAL);

diff --git a/Types.ecl b/Types.ecl
@@ -136,7 +136,7 @@ EXPORT Types := MODULE
       */
     EXPORT RV := RECORD
         STRING Name;
-        SET OF STRING Parents;
+        SET OF STRING Parents := [];
         BOOLEAN isObserved := TRUE;
         DatTypeEnum DataType := DatTypeEnum.None;
     END;

diff --git a/internal/ProbSpace.ecl b/internal/ProbSpace.ecl
@@ -223,7 +223,7 @@ EXPORT ProbSpace := MODULE
       *
       */
 
-    EXPORT STREAMED DATASET(NumericField) Dependence(STREAMED DATASET(ProbQuery) queries, UNSIGNED ps) := 
+    EXPORT STREAMED DATASET(NumericField) Dependence(STREAMED DATASET(ProbQuery) queries, STRING dmethod, UNSIGNED ps) := 
         EMBED(Python: globalscope(globalScope), persist('query'), activity)
         assert 'PS' in globals(), 'ProbSpace.Dependence: PS is not initialized.'
         try:
@@ -247,7 +247,7 @@ EXPORT ProbSpace := MODULE
                     else:
                         condition = cVar
                     conditions.append(condition)
-                result = PS.dependence(v1, v2, conditions)
+                result = PS.dependence(v1, v2, conditions, dMethod=dmethod) 
                 results.append((1, id, 1, result))
             return results
         except:

diff --git a/internal/cModel.ecl b/internal/cModel.ecl
@@ -76,11 +76,11 @@ EXPORT cModel := MODULE
                         pyrv = pyrvs[i]
                         rvName = pyrv[0]
                         rvParents = pyrv[1]
-                        rvIsDiscrete = pyrv[2]
+                        rvIsObserved = pyrv[2]
                         rvType = pyrv[3]
                         DS[rvName] = []
                         varMap[i+1] = rvName
-                        newrv = rv.RV(rvName, rvParents, rvIsDiscrete, rvType)
+                        newrv = rv.RV(rvName, rvParents, rvIsObserved, rvType)
                         RVs.append(newrv)
                 ids = []
                 lastId = None