quacks-ingredients: wip Base vs Witches vs Both

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

diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts
index e9f6acf1fde58562a48736930c091853e559579f..15e6bd8c52ad5325d053964c85a90375de365c02 100755 (executable)
--- a/quacks-ingredients-counts
+++ b/quacks-ingredients-counts
@@ -5,8 +5,11 @@ use strict;
 use Data::Dumper;
 use POSIX;
 
+our $which = shift @ARGV;
+
 sub xdata ($) {
     my ($cb) = @_;
+    return unless $which eq 'Base';
     foreach my $count (qw(1 2 3)) {
        foreach my $nspots (qw(1 2 3 4)) {
            $_ = $cb->($count,$nspots)."\t".$_;
@@ -27,14 +30,25 @@ foreach my $nspots (qw(1 2 3 4)) {
     $_=<DATA>; chomp or die;
     xdata sub {
        my ($xcount,$xnspots) = @_;
-       $xnspots == $nspots and $xcount;
+       $xnspots == $nspots and "$xcount+0";
     };
     my @l = split /\t/, $_;
-    foreach my $i (0..$#names) { $count{$names[$i]}{$nspots} = $l[$i] || 0; }
+    foreach my $i (0..$#names) {
+       $_ = $l[$i] || '0+0';
+       $_ ||= 0;
+       m/\+/;
+       
+       $count{$names[$i]}{$nspots} =
+           $which eq 'Both'    ? $` + $' :
+           $which eq 'Base'    ? $`      :
+           $which eq 'Witches' ?      $' :
+           die "$which ?";
+    }
 }
 
 $_ = Dumper(\%count);
 s{^}{// }mg;
+#print STDERR;
 
 our $name;
 our $total_count;
@@ -53,7 +67,8 @@ sub wrtoplevel () {
     $max_nrows = $nrows if $nrows > $max_nrows;
     $max_rowsz = $rowsz if $rowsz > $max_rowsz;
     my $ix = 0;
-    print "// $name: total=$total, rowsz=$rowsz, nrows=$nrows\n";
+    printf "// %-10s  total=%2d  rowsz=$rowsz  nrows=$nrows\n",
+       "$name", $total;
     foreach my $nspots (sort keys %$cs) {
        my $c = $cs->{$nspots};
        print <<END;
@@ -80,15 +95,15 @@ foreach $name (sort keys %count) {
 }
 
 print <<END;
-// total_count=$total_count total_real_count=$total_real_count
-// max_rowsz=$max_rowsz max_nrows=$max_nrows
+// total_count=$total_count   total_real_count=$total_real_count
+// max_rowsz=$max_rowsz       max_nrows=$max_nrows
 END
 
 STDOUT->error and die $!;
 
 __DATA__
 White  Green   Blue    Red     Yellow  Purple  Black   Orange
-20     15      14      12      13      15      18      20
-8      10      10      8       6
-4
-       13      10      10      10
+20+6   15+10   14+8    12+6    13+6    15+8    18+8    20+12
+8+3    10+5    10+5    8+5     6+5
+4+2
+       13+5    10+5    10+5    10+5