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 3e49a9528c227f2b1a8c48ae3cced84429741a78..6fb5a040e1f7963887440bd9bb121f4b2b568a27 100755
(executable)
--- a/
quacks-ingredients-counts
+++ b/
quacks-ingredients-counts
@@
-5,8
+5,11
@@
use strict;
use Data::Dumper;
use POSIX;
use Data::Dumper;
use POSIX;
+our $which = shift @ARGV;
+
sub xdata ($) {
my ($cb) = @_;
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".$_;
foreach my $count (qw(1 2 3)) {
foreach my $nspots (qw(1 2 3 4)) {
$_ = $cb->($count,$nspots)."\t".$_;
@@
-23,18
+26,29
@@
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) = @_;
- $xnspots == $nspots and
$xcount
;
+ $xnspots == $nspots and
"$xcount+0"
;
};
my @l = split /\t/, $_;
};
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/\+/ or die "$which $nspots ?";
+
+ $count{$names[$i]}{$nspots} =
+ $which eq 'All' ? $` + $' :
+ $which eq 'Base' ? $` :
+ $which eq 'Witches' ? $' :
+ die "$which ?";
+ }
}
$_ = Dumper(\%count);
s{^}{// }mg;
}
$_ = Dumper(\%count);
s{^}{// }mg;
+#print STDERR;
our $name;
our $total_count;
our $name;
our $total_count;
@@
-43,9
+57,10
@@
our $max_nrows=0;
our $max_rowsz=0;
sub wrtoplevel () {
our $max_rowsz=0;
sub wrtoplevel () {
- print "module $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;
@@
-53,8
+68,8
@@
sub wrtoplevel () {
$max_nrows = $nrows if $nrows > $max_nrows;
$max_rowsz = $rowsz if $rowsz > $max_rowsz;
my $ix = 0;
$max_nrows = $nrows if $nrows > $max_nrows;
$max_rowsz = $rowsz if $rowsz > $max_rowsz;
my $ix = 0;
- printf "// %-10s total=%2d rowsz=$rowsz nrows=$nrows\n",
- "$name", $total;
+ printf "// %
s %
-10s total=%2d rowsz=$rowsz nrows=$nrows\n",
+
$which,
"$name", $total;
foreach my $nspots (sort keys %$cs) {
my $c = $cs->{$nspots};
print <<END;
foreach my $nspots (sort keys %$cs) {
my $c = $cs->{$nspots};
print <<END;
@@
-81,15
+96,16
@@
foreach $name (sort keys %count) {
}
print <<END;
}
print <<END;
-// total_count=$total_count total_real_count=$total_real_count
-// max_rowsz=$max_rowsz max_nrows=$max_nrows
+//
$which
total_count=$total_count total_real_count=$total_real_count
+//
$which
max_rowsz=$max_rowsz max_nrows=$max_nrows
END
STDOUT->error and die $!;
__DATA__
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
+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
+