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

Timestamp:

02/19/19 05:05:24 (5 years ago)

Author:

hmaislin

Message:

#2929: Fixed result bug, added multitest C / Powershell, passed pagie_1

File:

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

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

@@ -34 +34 @@
 
     [DllImport("go-pge.dll", EntryPoint = "initTreeParams", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void InitTreeParams(IntPtr roots, IntPtr nodes, IntPtr nonTrig, IntPtr leafs, IntPtr usableVars, int numUsableVars, int maxSize, int minSize, int maxDepth, int minDepth);
+    public static extern void InitTreeParams(IntPtr roots, IntPtr nodes, IntPtr nonTrig, IntPtr leafs, int numUsableVars, int maxSize, int minSize, int maxDepth, int minDepth);
 
     [DllImport("go-pge.dll", EntryPoint = "initProblem", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
@@ -43 +43 @@
 
     [DllImport("go-pge.dll", EntryPoint = "getStepResult", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern IntPtr GetStepResult(out int noBestPush, out int bestNewMinErr, out int bestlen1, out int bestlen2, out int testscore, out int nCoeff);
+    public static extern IntPtr GetStepResult(out int testscore, out int nCoeff);
 
     [DllImport("go-pge.dll", EntryPoint = "getCoeffResult", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
@@ -345 +345 @@
 
       int numberOfUseableVariables = problemData.AllowedInputVariables.Count();
-      IntPtr cUseableVars = GetUsableVars(numberOfUseableVariables);
 
       InitSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, cInitMethod, cGrowMethod, sortType);
 
       // cUsableVars: list of indices into independent variables
-      InitTreeParams(cRoots, cNodes, cNonTrig, cLeafs, cUseableVars, numberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
-
-      
+      InitTreeParams(cRoots, cNodes, cNonTrig, cLeafs, numberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
+
       InitProblem(cName, MaxIterations, HitRatio, 
         searchVar: 0,  // SearchVar: index of dependent variables (this is always zero because we only have one target variable)
@@ -364 +362 @@
 
         for (int iResult = 0; iResult < nResults; iResult++) {
-          int nobestpush = 0;       //bool
-          int bestNewMinError = 0;  //bool
-          int bestlen1 = 0;
-          int bestlen2 = 0;
           int nCoeff = 0;
           int testScore = 0;
 
-          IntPtr eqn = GetStepResult(out nobestpush, out bestNewMinError, out bestlen1, out bestlen2, out testScore, out nCoeff);
+          IntPtr eqn = GetStepResult(out testScore, out nCoeff);
           string eqnStr = Marshal.PtrToStringAnsi(eqn);
 
@@ -378 +372 @@
             coeff[iCoeff] = GetCoeffResult();
           }
-          log.LogMessage("Push/Pop (" + iResult + ", " + bestlen1 + ", " + bestlen2 + ", " + testScore + ", noBestPush: " + (nobestpush > 0) + ", bestNewMin: " + (bestNewMinError > 0) + ") " + eqnStr + " coeff: " + string.Join(" ", coeff));
-
-          if (!string.IsNullOrEmpty(eqnStr) && (testScore < bestTestScore || bestNewMinError > 0)) {
+          log.LogMessage("Push/Pop (" + iResult + ", " + testScore + ") " + eqnStr + " coeff: " + string.Join(" ", coeff));
+
+          if (!string.IsNullOrEmpty(eqnStr) && (testScore < bestTestScore)) {
             // update best quality
             bestTestScore = testScore;
@@ -389 +383 @@
           bestTestScoreRow.Values.Add(bestTestScoreResult.Value); // always add the current best test score to data row
           curTestScoreRow.Values.Add(testScore);
-          len1Row.Values.Add(bestlen1);
-          len2Row.Values.Add(bestlen2);
         }
 
@@ -396 +388 @@
       }
 
-      Marshal.FreeHGlobal(cUseableVars);
       Marshal.FreeHGlobal(trainData);
       Marshal.FreeHGlobal(testData);
@@ -453 +444 @@
     }
 
-    private static IntPtr GetUsableVars(int n) {
-      long[] vars = new long[n];
-
-      for (int i = 0; i < n; i++) {
-        vars[i] = i;
-      }
-
-      IntPtr usableVars = Marshal.AllocHGlobal(sizeof(long) * n);
-      Marshal.Copy(vars, 0, usableVars, n);
-
-      return usableVars;
-    }
-
     private static IntPtr GetData(IDataset ds, IEnumerable<string> variableNames, IEnumerable<int> rows, out int n) {