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
air-hockey-puck: wip
[reprap-play.git]
/
quacks-ingredients-counts
diff --git
a/quacks-ingredients-counts
b/quacks-ingredients-counts
index b59a58a3c0574e33972d1a4e76a40d84df0185bb..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,7
+20,7
@@
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 @names = split /\t/, $_;
@@
-104,8
+104,8
@@
STDOUT->error and die $!;
__DATA__
White Green Blue Red Yellow Purple Black Orange Orange6 Loco WhiteSpare
__DATA__
White Green Blue Red Yellow Purple Black Orange Orange6 Loco WhiteSpare
-2
0
+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
+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
0+20 0+25
13+5 10+5 10+5 10+5
0+20 0+25