quacks-ingredients: better counting reports

[reprap-play.git] / quacks-ingredients-counts

diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts
index a1e5f27e40bbcbd86da57aaa6116b2427b0cf13e..e9f6acf1fde58562a48736930c091853e559579f 100755 (executable)
--- a/quacks-ingredients-counts
+++ b/quacks-ingredients-counts
@@ -5,13 +5,30 @@ use strict;
 use Data::Dumper;
 use POSIX;
 
+sub xdata ($) {
+    my ($cb) = @_;
+    foreach my $count (qw(1 2 3)) {
+       foreach my $nspots (qw(1 2 3 4)) {
+           $_ = $cb->($count,$nspots)."\t".$_;
+       }
+    }
+}
+
 $_=<DATA>; chomp or die;
+xdata sub {
+    my ($xcount,$xnspots) = @_;
+    "${xcount}x". (qw(X One Two Three Four)[$xnspots]);
+};
 our @names = split /\t/, $_;
 
 our %count;
 
 foreach my $nspots (qw(1 2 3 4)) {
     $_=<DATA>; chomp or die;
+    xdata sub {
+       my ($xcount,$xnspots) = @_;
+       $xnspots == $nspots and $xcount;
+    };
     my @l = split /\t/, $_;
     foreach my $i (0..$#names) { $count{$names[$i]}{$nspots} = $l[$i] || 0; }
 }
@@ -21,6 +38,7 @@ s{^}{// }mg;
 
 our $name;
 our $total_count;
+our $total_real_count;
 our $max_nrows=0;
 our $max_rowsz=0;
 
@@ -31,15 +49,16 @@ sub wrtoplevel () {
     my $rowsz = ceil(sqrt($total));
     my $nrows = ceil($total / $rowsz);
     $total_count += $total;
+    $total_real_count += $total if $name =~ m/^[A-Z][a-z]+$/;
     $max_nrows = $nrows if $nrows > $max_nrows;
     $max_rowsz = $rowsz if $rowsz > $max_rowsz;
     my $ix = 0;
-    print "// total=$total, rowsz=$rowsz, nrows=$nrows\n";
+    print "// $name: total=$total, rowsz=$rowsz, nrows=$nrows\n";
     foreach my $nspots (sort keys %$cs) {
        my $c = $cs->{$nspots};
        print <<END;
   union(){
-    Frame(\$phase, token_pitch * [ $rowsz + 0.5, $nrows ]);
+    Frame(\$phase, token_pitch * [ $rowsz + 1.00, $nrows + 0.50 ]);
     \$nspots = $nspots;
 END
        while ($c--) {
@@ -61,7 +80,7 @@ foreach $name (sort keys %count) {
 }
 
 print <<END;
-// total_count=$total_count
+// total_count=$total_count total_real_count=$total_real_count
 // max_rowsz=$max_rowsz max_nrows=$max_nrows
 END