Changeset 16231 for branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs

Timestamp:

10/17/18 04:47:09 (6 years ago)

Author:

hmaislin

Message:

#2929: Fixed result error

File:

• branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs (modified) (7 diffs)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs

@@ -37 +37 @@
 
     [DllImport("go-pge.dll", EntryPoint = "stepW", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void StepW();
+    public static extern int StepW();
 
     [DllImport("go-pge.dll", EntryPoint = "getStepResult", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
@@ -278 +278 @@
 
     protected override void Run(CancellationToken cancellationToken) {
-
       // TODO: the following is potentially problematic for other go processes run on the same machine at the same time
+      // shouldn't be problematic bc is inherited only, normally only child processes are affected
       Environment.SetEnvironmentVariable("GOGC", "off");
       Environment.SetEnvironmentVariable("GODEBUG", "cgocheck=0");
       Environment.SetEnvironmentVariable("CGO_ENABLED", "1");
-
+      Environment.SetEnvironmentVariable("PGEDEBUG", "0");
 
 
@@ -301 +301 @@
       IntPtr testData = GetData(problemData.Dataset, variables, problemData.TestIndices, out nTestData);
 
+      nTrainData = Problem.ProblemData.TrainingPartition.Size;
+      nTestData = Problem.ProblemData.TestPartition.Size;
+
       var inputVariableNames = string.Join(" ", problemData.AllowedInputVariables); 
       // TODO: does this work when input variables contain spaces?
@@ -322 +325 @@
 
 
-
       AddTestData(cIndepNames, cDependentNames, testData, nTestData);
 
@@ -343 +345 @@
         curItersItem.Value = iter;
 
-        StepW();  // TODO: alg crashes here
-
-        for (int iPeel = 0; iPeel < PeelCnt; iPeel++) {
+        int nResults = StepW();
+
+        for (int iResult = 0; iResult < nResults; iResult++) { 
           int nobestpush = 0;       //bool
           int bestNewMinError = 0;  //bool
@@ -357 +359 @@
           string eqnStr = Marshal.PtrToStringAnsi(eqn);
 
-          if (nobestpush == 1) 
-          {
-            Console.WriteLine("No best push");
-          } else {
-            Console.WriteLine("Push/Pop (" + bestlen1 + "," + bestlen2 + ") " + eqnStr);
-
-            StringBuilder sb = new StringBuilder("");
-            for (int iCoeff = 0; iCoeff < nCoeff; iCoeff++) {
-              double coeffVal = GetCoeffResult();
-              Console.WriteLine("Coeff: " + coeffVal);
-              sb.Append(coeffVal + "; ");
-            }
-
-            var curItersResult = new Result("Iteration " + iter + " " + iPeel, curItersItem);
-            var coeffItersResult = new Result("Coeff " + iter + " " + iPeel, new StringValue(sb.ToString()));
-
-            var bestQualityItem = new StringValue(eqnStr);
-            var bestQualityResult = new Result("Best quality " + iter + " " + iPeel, bestQualityItem);
-            Results.Add(curItersResult);
-            Results.Add(coeffItersResult);
-            Results.Add(bestQualityResult);
-   
+          Console.WriteLine("Push/Pop (" + bestlen1 + "," + bestlen2 + ") " + eqnStr);
+          StringBuilder sb = new StringBuilder("");
+          for (int iCoeff = 0; iCoeff < nCoeff; iCoeff++) {
+            double coeffVal = GetCoeffResult();
+            Console.WriteLine("Coeff: " + coeffVal);
+            sb.Append(coeffVal + "; ");
           }
 
+          var curItersResult = new Result("Iteration " + iter + " " + iResult, curItersItem);
+          var coeffItersResult = new Result("Coeff " + iter + " " + iResult, new StringValue(sb.ToString()));
+
+          var bestQualityItem = new StringValue(eqnStr);
+          var bestQualityResult = new Result("Best quality " + iter + " " + iResult, bestQualityItem);
+          Results.Add(curItersResult);
+          Results.Add(coeffItersResult);
+          Results.Add(bestQualityResult);
         }
 
@@ -389 +383 @@
       Marshal.FreeHGlobal(trainData);
       Marshal.FreeHGlobal(testData);
+
+      Marshal.FreeHGlobal(cIndepNames);
+      Marshal.FreeHGlobal(cDependentNames);
+
+      Marshal.FreeHGlobal(cInitMethod);
+      Marshal.FreeHGlobal(cGrowMethod);
+
+      Marshal.FreeHGlobal(cRoots);
+      Marshal.FreeHGlobal(cNodes);
+      Marshal.FreeHGlobal(cNonTrig);
+      Marshal.FreeHGlobal(cLeafs);
+
+      Marshal.FreeHGlobal(cName);
+      Marshal.FreeHGlobal(cProblemTypeString);
+
       // Results.Add(new Result("Execution time", new TimeSpanValue(this.ExecutionTime)));
     }