Graph

When TD is <= 0 just forget about it

Author: msoos

scripts/data/create_graphs_ganak.py

@@ -483,9 +483,13 @@ def get_dirs(ver : str):
             # "out-ganak-gpmc-mei-14294765-", # gpmc
             # "out-ganak-gpmc-mei-14295250-0", # ganak, fixed complex
             # "out-ganak-gpmc-mei-14295899-0", # mpfr ganak
+            # "out-ganak-gpmc-mei-14294765-1",
+            # "out-ganak-gpmc-mei-14295250-0",
+            # "out-ganak-gpmc-mei-14295899-0",
 
             # blocking
-            "out-ganak-mccomp2324-14299825",
+            # "out-ganak-mccomp2324-14299825", # sigFPE in blocking, messed up get_weight vs *get_weight in Arjun
+            "out-ganak-mccomp2324-14309534", # new blocking, Fields, etc
             ]
 # only_dirs = ["out-ganak-6828273"] #-- functional synth
 #"6393432", "6393432", "6349002",, "6349002", "6387743" "6356951"] #, "out-ganak-6318929.pbs101-4", "out-ganak-6328707.pbs101-7", "out-ganak-6318929.pbs101-7"] #,"6348728" "6346880", "6335522", "6328982", "6328707"]
@@ -499,7 +503,6 @@ def get_dirs(ver : str):
 # only_calls = ["vsadsadjust 128"]
 only_calls = []
 # not_calls = ["restart"]
-only_files = ["track3", "track4"]
 not_calls = []
 todo = versions
 
@@ -663,7 +666,7 @@ def get_dirs(ver : str):
     f.write("set ylabel  \"Instances counted\"\n")
     f.write("set xlabel \"Time (s)\"\n")
     # f.write("plot [:][10:]\\\n")
-    f.write("plot [:][:]\\\n")
+    f.write("plot [:][900:]\\\n")
     i = 0
     # f.write(" \"runkcbox-prearjun.csv.gnuplotdata\" u 2:1 with linespoints  title \"KCBox\",\\\n")
     # f.write(" \"runsharptd-prearjun.csv.gnuplotdata\" u 2:1 with linespoints  title \"SharptTD\",\\\n")

src/comp_analyzer.cpp

@@ -246,7 +246,6 @@ void CompAnalyzer::calc_blocked(
       << " avg blocked/lit: " << (double)blocked_tot/(double)(n*2-2) << " T: " << cpu_time()-start_time);
   verb_print(1, "cls with blocked lits: " << cls_blocked << " / " << long_irred_cls.size()
       << " = " << (double)cls_blocked/(double)long_irred_cls.size()*100 << "%");
-
 }
 
 // Builds occ lists and sets things up, Done exactly ONCE for a whole counting runkk

src/counter.cpp

@@ -134,7 +134,11 @@ bool Counter::remove_duplicates(vector<Lit>& lits) {
 void Counter::compute_score(TWD::TreeDecomposition& tdec, uint32_t nodes, bool print) {
   const auto& bags = tdec.Bags();
   td_width = tdec.width();
-  if (print || conf.verb >= 1) verb_print(0, "[td] Calculated TD width: " << td_width-1);
+  if (td_width <= 0) {
+    if (print) verb_print(1, "TD width is 0, ignoring TD");
+    return;
+  }
+  if (print) verb_print(2, "[td] Calculated TD width: " << td_width-1);
   const auto& adj = tdec.get_adj_list();
 #if 0
   for(uint32_t i = 0; i < bags.size(); i++) {
@@ -150,14 +154,14 @@ void Counter::compute_score(TWD::TreeDecomposition& tdec, uint32_t nodes, bool p
 #endif
   std::vector<int> dists = tdec.distanceFromCentroid(nodes);
   if (dists.empty()) {
-      verb_print(1, "All projected vars in the same bag, ignoring TD");
+      if (print) verb_print(1, "All projected vars in the same bag, ignoring TD");
       return;
   } else {
     int max_dst = 0;
     for(int i=1; i < (int)nodes; i++)
       max_dst = std::max(max_dst, dists[i]);
     if (max_dst == 0) {
-      verb_print(1, "All projected vars are the same distance, ignoring TD");
+      if (print) verb_print(1, "All projected vars are the same distance, ignoring TD");
       return;
     }
   }
@@ -213,9 +217,8 @@ void Counter::compute_score(TWD::TreeDecomposition& tdec, uint32_t nodes, bool p
     tdscore[i] = val;
   }
 
-  for(uint32_t i = 1; i < nodes; i++) {
-      verb_print(2, "TD var: " << i << " tdscore: " << tdscore[i]);
-  }
+  for(uint32_t i = 1; i < nodes; i++)
+    verb_print(2, "TD var: " << i << " tdscore: " << tdscore[i]);
 }
 
 TWD::TreeDecomposition Counter::td_decompose_component(double mult) {