Changeset 16197 for branches/2929_PrioritizedGrammarEnumeration

Timestamp:

09/28/18 17:05:11 (6 years ago)

Author:

gkronber

Message:

#2929: renaming things

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

@@ -18 +18 @@
   public unsafe class PGE : BasicAlgorithm {
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void addTestData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
+    [DllImport("go-pge.dll", EntryPoint = "addTestData", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern void AddTestData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void addTrainData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
+    [DllImport("go-pge.dll", EntryPoint = "addTrainData", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern void AddTrainData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void initSearch(int maxGen, int pgeRptEpoch, int pgeRptCount, int pgeArchiveCap, int peelCnt, int evalrCount, double zeroEpsilon, IntPtr initMethod, IntPtr growMethod, int sortType);
+    [DllImport("go-pge.dll", EntryPoint = "initSearch", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern void InitSearch(int maxGen, int pgeRptEpoch, int pgeRptCount, int pgeArchiveCap, int peelCnt, int evalrCount, double zeroEpsilon, IntPtr initMethod, IntPtr growMethod, int sortType);
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void initTreeParams(IntPtr Roots, IntPtr Nodes, IntPtr NonTrig, IntPtr Leafs, IntPtr UsableVars, int UsableVarsN, int MaxSize, int MinSize, int MaxDepth, int MinDepth);
+    [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 UsableVarsN, int MaxSize, int MinSize, int MaxDepth, int MinDepth);
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void initProblem(IntPtr Name, int MaxIter, double HitRatio, int SearchVar, IntPtr ProblemTypeString, int numProcs);
+    [DllImport("go-pge.dll", EntryPoint = "initProblem", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern void InitProblem(IntPtr Name, int MaxIter, double HitRatio, int SearchVar, IntPtr ProblemTypeString, int numProcs);
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void stepW();
+    [DllImport("go-pge.dll", EntryPoint = "stepW", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern void StepW();
 
-    [DllImport("go-pge.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern IntPtr getStepResult(out Int64 nobestpush, out Int64 bestnewminerr, out Int64 bestlen1, out Int64 bestlen2, out Int64 testscore, out IntPtr coeff, out Int64 nCoeff);
+    [DllImport("go-pge.dll", EntryPoint = "getStepResult", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    public static extern IntPtr GetStepResult(out Int64 nobestpush, out Int64 bestnewminerr, out Int64 bestlen1, out Int64 bestlen2, out Int64 testscore, out IntPtr coeff, out Int64 nCoeff);
 
     public override Type ProblemType { get { return typeof(RegressionProblem); } }
@@ -285 +285 @@
     }
 
-    // Persistence uses this ctor to improve deserialization efficiency.
-    // If we would use the default ctor instead this would completely initialize the object (e.g. creating parameters)
-    // even though the data is later overwritten by the stored data.
+ 
     [StorableConstructor]
     public PGE(bool deserializing) : base(deserializing) { }
 
-    // Each clonable item must have a cloning ctor (deep cloning, the cloner is used to handle cyclic object references)
-    public PGE(PGE original, Cloner cloner) : base(original, cloner) {
-      // Don't forget to call the cloning ctor of the base class
-      // TODO: if this class has fields then they need to be cloned here
+   
+    public PGE(PGE original, Cloner cloner) : base(original, cloner) {    
+      // nothing to clone
     }
 
@@ -303 +300 @@
     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
       Environment.SetEnvironmentVariable("GOGC", "off");
       Environment.SetEnvironmentVariable("GODEBUG", "cgocheck=0");
       Environment.SetEnvironmentVariable("CGO_ENABLED", "1");
 
-      //Parameter
-      int MaxIter = MaxIterations;
-      string indepNames = IndependedNames;
-      string depndNames = DependedNames;
       
       int nTrainData = 200;   //Woher ?
@@ -321 +315 @@
       string Name = "Korns_02";
 
-      //Calcs
-      int indepLen = indepNames.Split(' ').Length;
-      int depLen = depndNames.Split(' ').Length;
 
-      IntPtr TrainData = GetTrainData(indepLen, depLen, nTrainData);
-      IntPtr TestData = GetTestData(indepLen, depLen, nTestData);
+      int indepLen = IndependedNames.Split(' ').Length;
+      int depLen = DependedNames.Split(' ').Length;
 
-      IntPtr CindepNames = Marshal.StringToHGlobalAnsi(indepNames);
-      IntPtr CdepndNames = Marshal.StringToHGlobalAnsi(depndNames);
+      IntPtr trainData = GetTrainData(indepLen, depLen, nTrainData);
+      IntPtr testData = GetTestData(indepLen, depLen, nTestData);
 
-      IntPtr CinitMethod = Marshal.StringToHGlobalAnsi(InitMethod);
-      IntPtr CgrowMethod = Marshal.StringToHGlobalAnsi(GrowMethod);
+      IntPtr cIndepNames = Marshal.StringToHGlobalAnsi(IndependedNames);
+      IntPtr cDependentNames = Marshal.StringToHGlobalAnsi(DependedNames);
 
-      IntPtr Croots = Marshal.StringToHGlobalAnsi(Roots);
-      IntPtr Cnodes = Marshal.StringToHGlobalAnsi(Nodes);
-      IntPtr CnonTrig = Marshal.StringToHGlobalAnsi(NonTrig);
-      IntPtr Cleafs = Marshal.StringToHGlobalAnsi(Leafs);
+      IntPtr cInitMethod = Marshal.StringToHGlobalAnsi(InitMethod);
+      IntPtr cGrowMethod = Marshal.StringToHGlobalAnsi(GrowMethod);
 
-      IntPtr Cname = Marshal.StringToHGlobalAnsi(Name);
-      IntPtr CproblemTypeString = Marshal.StringToHGlobalAnsi(ProblemTypeString);
+      IntPtr cRoots = Marshal.StringToHGlobalAnsi(Roots);
+      IntPtr cNodes = Marshal.StringToHGlobalAnsi(Nodes);
+      IntPtr cNonTrig = Marshal.StringToHGlobalAnsi(NonTrig);
+      IntPtr cLeafs = Marshal.StringToHGlobalAnsi(Leafs);
+
+      IntPtr cName = Marshal.StringToHGlobalAnsi(Name);
+      IntPtr cProblemTypeString = Marshal.StringToHGlobalAnsi(ProblemTypeString);
 
 
-      Console.WriteLine("AddTrainData");
-      addTestData(CindepNames, CdepndNames, TestData, nTestData);
+      AddTestData(cIndepNames, cDependentNames, testData, nTestData);
 
-      Console.WriteLine("AddTestData");
-      addTrainData(CindepNames, CdepndNames, TrainData, nTrainData);
+      AddTrainData(cIndepNames, cDependentNames, trainData, nTrainData);
 
       IntPtr UsableVars = GetUsableVars(NumberOfUseableVariables);
 
-      Console.WriteLine("InitSearch");
-      initSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, CinitMethod, CgrowMethod, SortType);
+      InitSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, cInitMethod, cGrowMethod, SortType);
 
-      Console.WriteLine("InitTree");
-      initTreeParams(Croots, Cnodes, CnonTrig, Cleafs, UsableVars, NumberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
+      InitTreeParams(cRoots, cNodes, cNonTrig, cLeafs, UsableVars, NumberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
 
-      Console.WriteLine("InitProblem");
-      initProblem(Cname, MaxIter, HitRatio, SearchVar, CproblemTypeString, NumProcs);
+      InitProblem(cName, MaxIterations, HitRatio, SearchVar, cProblemTypeString, NumProcs);
 
-      Console.WriteLine("Finished Init");
 
       var curItersItem = new IntValue();
@@ -368 +356 @@
       Marshal.Copy(coeffmem, 0, Coeff, NumberOfUseableVariables);
 
-      for (int iter = 1; iter <= MaxIter; iter++) {
+      for (int iter = 1; iter <= MaxIterations; iter++) {
         curItersItem.Value = iter;
 
         Console.WriteLine("Step " + iter);
-        stepW();
+        StepW();
 
         for (int iPeel = 0; iPeel < PeelCnt; iPeel++) {
@@ -382 +370 @@
           Int64 TestScore = 0;
 
-          IntPtr eqn = getStepResult(out nobestpush, out bestnewminerr, out bestlen1, out bestlen2, out TestScore, out Coeff, out nCoeff);
+          IntPtr eqn = GetStepResult(out nobestpush, out bestnewminerr, out bestlen1, out bestlen2, out TestScore, out Coeff, out nCoeff);
 
           string eqnStr = Marshal.PtrToStringAnsi(eqn);
@@ -418 +406 @@
       //Marshal.FreeHGlobal(CproblemTypeString);
       //Marshal.FreeHGlobal(Cname);
-      Results.Add(new Result("Execution time", new TimeSpanValue(this.ExecutionTime)));
+      // done anyway?
+      // Results.Add(new Result("Execution time", new TimeSpanValue(this.ExecutionTime)));
     }