From 318cd4aab5ab06cf6a5f36553654ea97d3940839 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 17 Sep 2009 00:28:42 +0100 Subject: [PATCH 1/1] Remove some leftover debugging --- yarrg/web/routetrade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 05294b5..4be17c6 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -324,7 +324,7 @@ foreach my $f (@flows) { my $first= $base; do { my $this= $uue % $base; -print STDERR "uue=$uue this=$this "; +#print STDERR "uue=$uue this=$this "; $uue -= $this; $uue /= $base; $this += $first; @@ -332,8 +332,8 @@ print STDERR "uue=$uue this=$this "; $cmpu .= chr($this + ($this < 26 ? ord('a') : $this < 52 ? ord('A')-26 : ord('0')-52)); -print STDERR " uue=$uue this=$this cmpu=$cmpu\n"; -die "$cmpu $uue ?" if length $cmpu > 20; +#print STDERR " uue=$uue this=$this cmpu=$cmpu\n"; + die "$cmpu $uue ?" if length $cmpu > 20; } while ($uue); $cmpu; } @uid; @@ -450,9 +450,9 @@ foreach my $ci (0..($#islandids-1)) { next unless @relsubflow; die unless @relsubflow == 1; push @rel_subflows, @relsubflow; -print " RELEVANT $ci $relsubflow[0]->{Var} "; +#print " RELEVANT $ci $relsubflow[0]->{Var} "; } -print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." "; +#print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." "; if (!@rel_subflows) { foreach my $mv (qw(mass volume)) { $sail_total[$ci]{$mv}= 0; @@ -463,11 +463,11 @@ print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." "; my $applylimit= sub { my ($mv, $max, $f2val) = @_; return unless defined $max; -print " DEFINED MAX $mv $max "; +#print " DEFINED MAX $mv $max "; $cplex .= " ". sprintf("%-10s","${mv}_$ci:")." ". join(" + ", map { -print " PART MAX $_->{Var} $_->{Flow}{Ix} "; +#print " PART MAX $_->{Var} $_->{Flow}{Ix} "; $f2val->($_->{Flow}) .' '. $_->{Var}; } @rel_subflows). " <= $max"; -- 2.30.2