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
nook-case: edge ledge
[reprap-play.git]
/
quacks-ingredients-counts
diff --git
a/quacks-ingredients-counts
b/quacks-ingredients-counts
index ae55648450fd3a854f3b9d0439e673a0d415bac5..5377cbcb1d53e18e982b95d4bddbbe898d3e5ed5 100755
(executable)
--- a/
quacks-ingredients-counts
+++ b/
quacks-ingredients-counts
@@
-11,7
+11,7
@@
sub xdata ($) {
my ($cb) = @_;
return unless $which eq 'Base';
foreach my $count (qw(1 2 3)) {
my ($cb) = @_;
return unless $which eq 'Base';
foreach my $count (qw(1 2 3)) {
- foreach my $nspots (qw(1 2 3 4)) {
+ foreach my $nspots (qw(
0
1 2 3 4)) {
$_ = $cb->($count,$nspots)."\t".$_;
}
}
$_ = $cb->($count,$nspots)."\t".$_;
}
}
@@
-20,13
+20,13
@@
sub xdata ($) {
$_=<DATA>; chomp or die;
xdata sub {
my ($xcount,$xnspots) = @_;
$_=<DATA>; chomp or die;
xdata sub {
my ($xcount,$xnspots) = @_;
- "${xcount}x". (qw(
X
One Two Three Four)[$xnspots]);
+ "${xcount}x". (qw(
Zero
One Two Three Four)[$xnspots]);
};
our @names = split /\t/, $_;
our %count;
};
our @names = split /\t/, $_;
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) = @_;
@@
-57,10
+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;
return unless $total;
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;
@@
-103,8
+103,9
@@
END
STDOUT->error and die $!;
__DATA__
STDOUT->error and die $!;
__DATA__
-White Green Blue Red Yellow Purple Black Orange
-2
0+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
Orange6 Loco WhiteSpare
+2
1+6 15+10 14+8 12+6 13+6 15+8 18+8 20+12 1+0
+9+3 10+5 10+5 8+5 6+5 1+0
+5+2 1+0
13+5 10+5 10+5 10+5
13+5 10+5 10+5 10+5
+ 0+20 0+25