Changeset 16510 for branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/plug/pge.go

Timestamp:

01/07/19 06:59:25 (5 years ago)

Author:

hmaislin

Message:

#2929: Updated DLL, result error seems to be fixed, more testing is necessary

File:

• branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/plug/pge.go (modified) (4 diffs)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/plug/pge.go

@@ -72 +72 @@
 //export AddTrainData
 func AddTrainData(indepNames *C.char, depndNames *C.char, matrix unsafe.Pointer, nEntries int) {
-  trainDatas = make([]*probs.PointSet, 1)
+  trainDatas = make([]*probs.PointSet, 1) //wieso bin i do und ned im initsearch oda so !!
   trainData = new(probs.PointSet)
   
@@ -112 +112 @@
   goName := C.GoString(Name)
   goProblemTypeString := C.GoString(ProblemTypeString)
-  fmt.Printf("1\n")
   
   ep.CreatePS(goName, MaxIter, HitRatio, SearchVar, goProblemTypeString)
   ep.TreeCfg = tp;
   ep.UsableVars = tp.UsableVars
-  fmt.Printf("2\n")
   
   cps.SetMaxIter(MaxIter)
   per_eqns = make([]*probs.ExprReportArray, 1)
-  fmt.Printf("3\n")
   
   ep.Train = trainDatas
   ep.Test = testDatas
-  fmt.Printf("4\n")
   
   initDone := make(chan int)
   rt.GOMAXPROCS(numProcs)
   rand.Seed(rand.Int63())
-  fmt.Printf("5\n")
   
   epcomm = new(probs.ExprProblemComm)
@@ -138 +133 @@
   epcomm.Gen = make(chan [2]int, 64)
   
-  fmt.Printf("6\n")
-  
   cps.SetProb(ep)
-  cps.Init(initDone, ep, "dummy", epcomm)
-  fmt.Printf("7\n")
+  cps.Init(initDone, ep, "", epcomm)
 }
 
@@ -252 +244 @@
   if ok && resu != nil {
     stepResult = *resu
-    nNew = nRes - nLastResults
-    nLastResults = nRes
+    nNew = nRes // - nLastResults
+    nLastResults = 0 //nRes
   }