Misc improvements to solver/generator visualization

Author: jsnell

Diff for: pics.sh

@@ -2,11 +2,19 @@
 
 set -e
 
+perl solve_from_db.pl expert 95; perl vis.pl < foo > solver.svg
+
 MAP_HEIGHT=10 MAP_WIDTH=10 PIECES=20 cmake . && make
 bin/mklinjat --puzzle_count=1 --seed=90210 --solve_progress_file=progress-opt.json --score_cover=1 --score_cant_fit=3 --score_square=50 --score_dep=100 --score_one_of=60 --score_max_width=-1
 perl vis.pl < progress-opt.json > progress-opt.svg
 
-MAP_HEIGHT=8 MAP_WIDTH=8 PIECES=15 cmake . && make
+MAP_HEIGHT=10 MAP_WIDTH=10 PIECES=16 cmake . && make
 bin/mklinjat --puzzle_count=1 --seed=90210 --candidate_progress_file=dots-opt.json --score_cover=1 --score_cant_fit=3 --score_square=50 --score_dep=100 --score_one_of=60 --score_max_width=-1 --optimize_iterations=0
 perl vis.pl < dots-opt.json > dots-opt.svg
 
+perl solve_from_db.pl easy 4; perl vis.pl < foo > unique.svg
+
+for i in solver progress-opt dots-opt unique; do
+    rsvg-convert < $i.svg > $i.png
+    convert $i.png -scale 480 $i-thumb.png
+done

Diff for: solve_from_db.pl

@@ -18,6 +18,8 @@
 
 die if system "MAP_HEIGHT=$h MAP_WIDTH=$w PIECES=$p cmake . && make ";
 my $res = qx(bin/mklinjat --solve="$str" --solve_progress_file=foo);
-
+print $res;
+my $json = decode_json $res;
+print $json->{classification}{'single-solution'}{depth};
 
 

Diff for: src/main.cc

@@ -1118,14 +1118,15 @@ Game add_forced_squares(Game game, FILE* fp) {
         if (game.force_if_uncontested() && fp)
             game.print_json(fp, "\"type\":\"ambiguate\",");
         auto res = game.iterate();
-        if (fp)
-            game.print_json(fp, "");
         if (res.first == DeductionKind::NONE) {
             if (!game.force_one_square()) {
                 break;
             }
             if (fp)
                 game.print_json(fp, "\"type\":\"add dot\",");
+        } else {
+            if (fp)
+                game.print_json(fp, "");
         }
         if (game.impossible()) {
             break;

Diff for: vis.pl

@@ -21,13 +21,13 @@ sub draw_board {
     my $hwidth = $width / 2;
 
     if ($board->{type}) {
-        print "<text x='$hwidth' y='18' text-anchor='middle' fill='black' class='number'>$board->{type}</text>";
+        print "<text x='$hwidth' y='18' text-anchor='middle' fill='black' class='text'>$board->{type}</text>";
     }
     if (exists $board->{iter}) {
-        print "<text x='5' y='18' text-anchor='left' fill='black' class='snumber'>Iteration: $board->{iter}</text>";
+        print "<text x='5' y='18' text-anchor='left' fill='black' class='text'>Iteration: $board->{iter}</text>";
     }
     if (exists $board->{score}) {
-        print "<text x='$hwidth' y='18' text-anchor='middle' fill='black' class='snumber'>Score: $board->{score}</text>";
+        print "<text x='$hwidth' y='18' text-anchor='middle' fill='black' class='text'>Score: $board->{score}</text>";
     }
     print "<g transform='translate(5, 21)'>";    
     print "<rect x='0' y='0' height='$height' width='$width' stroke='black' stroke-width='2' fill='white'/>";
@@ -75,8 +75,10 @@ sub draw_board {
 
 print qq(<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <style>
-    .number { font: bold 28px sans-serif; }
+    .number { font-size: 28px; }
+    .text { font-size: 16px; }
   </style>
+  <rect width="100%" height="100%" fill="white"></rect>
 );
 
 my $x_offset = 5;