Changeset 16666 for branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/src/go-pge/pge

Timestamp:

03/07/19 22:40:31 (6 years ago)

Author:

hmaislin

Message:

#2929: Modified make / folder structure to build original app, added x86 dll

File:

• branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/src/go-pge/pge/pge_search.go (modified) (6 diffs)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/src/go-pge/pge/pge_search.go

@@ -262 +262 @@
   PS.eval_out = make(chan *probs.ExprReport, 4048)
 
-  fmt.Printf("Init5a\n")
   for i := 0; i < PS.cnfg.evalrCount; i++ {
     go PS.Evaluate()
@@ -306 +305 @@
 
     // if PS.iter%PS.cnfg.pgeRptEpoch == 0 {
-    PS.reportExpr()
+    PS.ReportExpr(false)
     // }
 
@@ -349 +348 @@
 
   fmt.Println("PGE sending last report")
-  PS.reportExpr()
+  PS.ReportExpr(false)
 
 }
@@ -473 +472 @@
   PS.commup.Res <- &inserts
 
-  PS.reportExpr()
+  PS.ReportExpr(false)
   PS.iter++
 
@@ -549 +548 @@
 }
 
-//Hier ist das pgeRpt problem, liefert immer die besten pgerpt cnt ergebnisse zurueck
-// //*
-func (PS *PgeSearch) reportExpr() {
+func (PS *PgeSearch) ReportExpr(writeChannel bool) {
 
   cnt := PS.cnfg.pgeRptCount
   PS.Best.Sort()
 
-  // repot best equations
+  // report best equations
   rpt := make(probs.ExprReportArray, cnt)
   if PS.Best.Len() < cnt {
@@ -571 +568 @@
   }
 
-  //PS.commup.Rpts <- &rpt
-
+  if writeChannel {
+    PS.commup.Rpts <- &rpt
+  }
 }