chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quacks-ingredients: -counts: Have zero-spots counters too
[reprap-play.git]
/
quacks-ingredients-counts
diff --git
a/quacks-ingredients-counts
b/quacks-ingredients-counts
index cf883af99e3ac88517651c06c7abc29efea6b398..6fb5a040e1f7963887440bd9bb121f4b2b568a27 100755
(executable)
--- a/
quacks-ingredients-counts
+++ b/
quacks-ingredients-counts
@@
-26,7
+26,7
@@
our @names = split /\t/, $_;
our %count;
our %count;
-foreach my $nspots (qw(1 2 3 4)) {
+foreach my $nspots (qw(1 2 3 4
0
)) {
$_=<DATA>; chomp or die;
xdata sub {
my ($xcount,$xnspots) = @_;
$_=<DATA>; chomp or die;
xdata sub {
my ($xcount,$xnspots) = @_;
@@
-36,10
+36,10
@@
foreach my $nspots (qw(1 2 3 4)) {
foreach my $i (0..$#names) {
$_ = $l[$i] || '0+0';
$_ ||= 0;
foreach my $i (0..$#names) {
$_ = $l[$i] || '0+0';
$_ ||= 0;
- m/\+/;
+ m/\+/
or die "$which $nspots ?"
;
$count{$names[$i]}{$nspots} =
$count{$names[$i]}{$nspots} =
- $which eq 'All' ? $` + $' :
+ $which eq 'All'
? $` + $' :
$which eq 'Base' ? $` :
$which eq 'Witches' ? $' :
die "$which ?";
$which eq 'Base' ? $` :
$which eq 'Witches' ? $' :
die "$which ?";
@@
-57,9
+57,10
@@
our $max_nrows=0;
our $max_rowsz=0;
sub wrtoplevel () {
our $max_rowsz=0;
sub wrtoplevel () {
- print "module ${which}_$name(){ ////toplevel\n";
my $cs = $count{$name};
my $total = 0; $total += $_ foreach values %$cs;
my $cs = $count{$name};
my $total = 0; $total += $_ foreach values %$cs;
+ return unless $total;
+ print "module ${which}_$name(){ ////toplevel\n";
my $rowsz = ceil(sqrt($total));
my $nrows = ceil($total / $rowsz);
$total_count += $total;
my $rowsz = ceil(sqrt($total));
my $nrows = ceil($total / $rowsz);
$total_count += $total;
@@
-102,8
+103,9
@@
END
STDOUT->error and die $!;
__DATA__
STDOUT->error and die $!;
__DATA__
-White Green Blue Red Yellow Purple Black Orange
-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
+White Green Blue Red Yellow Purple Black Orange
WhiteSpare
+20+6 15+10 14+8 12+6 13+6 15+8 18+8 20+12
1+0
+8+3 10+5 10+5 8+5 6+5
1+0
+4+2
1+0
13+5 10+5 10+5 10+5
13+5 10+5 10+5 10+5
+