Merge pull request #66 from amurrayw/master

Added initial round of test cases...
cmu-phil · Nov 20, 2015 · ce49693 · ce49693
2 parents 5946bb2 + b120c6f
commit ce49693
Show file tree

Hide file tree

Showing 2 changed files with 1,271 additions and 4 deletions.
diff --git a/.../java/edu/cmu/tetrad/search/DMSearch.java → .../java/edu/cmu/tetrad/search/DMSearch.java b/.../java/edu/cmu/tetrad/search/DMSearch.java → .../java/edu/cmu/tetrad/search/DMSearch.java
@@ -1,4 +1,4 @@
-package edu.cmu.tetradproj.amurrayw;
+package edu.cmu.tetrad.search;
 
 import edu.cmu.tetrad.data.CovarianceMatrixOnTheFly;
 import edu.cmu.tetrad.data.DataSet;
@@ -153,7 +153,7 @@ public Graph search() {
         Graph pattern = new EdgeListGraph();
 
         if(useGES==true){
-            FastGes ges = new FastGes(cov);
+            Fgs ges = new Fgs(cov);
 
             pattern = recursiveGES(pattern, knowledge, this.gesDiscount, getMinDepth(), data, inputString);
         }
@@ -603,7 +603,7 @@ private Graph recursiveGES(Graph previousGES, Knowledge2 knowledge, double penal
         this.cov = new CovarianceMatrixOnTheFly(data);
 
 
-        FastGes ges = new FastGes((ICovarianceMatrix) cov);
+        Fgs ges = new Fgs((ICovarianceMatrix) cov);
 
         ges.setKnowledge(knowledge);
         ges.setDepth(this.gesDepth);
@@ -775,7 +775,7 @@ private Set<Node> getInputParents(Node node, Set inputString, Graph pattern) {
         return (actualInputs);
     }
 
-    class LatentStructure {
+    public class LatentStructure {
         List<Node> latents = new ArrayList<Node>();
         Map<Node, SortedSet<Node>> inputs = new TreeMap<Node, SortedSet<Node>>();
         Map<Node, SortedSet<Node>> outputs = new TreeMap<Node, SortedSet<Node>>();