X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=397e3854372787170afe7e1861de55150aa6495a;hb=202510fa47a7459760d6e41f6017500696e344d8;hp=e5e59aadc66d64e77bea919b2022f9e2e7593050;hpb=59464c798776cdd7f4fffbca4540238ddc5d7cbe;p=ypp-sc-tools.db-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index e5e59aa..397e385 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -435,15 +435,15 @@ foreach my $ci (0..($#islandids-1)) { next unless grep { $f->{'dst_id'} == $_ } @islandids[$ci+1..@islandids-1]; push @rel_flows, $f; -print " RELEVANT $ci $f->{Ix} "; +#print " RELEVANT $ci $f->{Ix} "; } -print " RELEVANT $ci COUNT ".scalar(@rel_flows)." "; +#print " RELEVANT $ci COUNT ".scalar(@rel_flows)." "; next unless @rel_flows; foreach my $mv (qw(mass volume)) { my $max_vn= "max_$mv"; my $max= $mv eq 'mass' ? $max_mass : $max_volume; next unless defined $max; -print " DEFINED MAX $mv $max "; +#print " DEFINED MAX $mv $max "; $cplex .= " ". sprintf("%-10s","${mv}_$ci:")." ". join(" + ", map { ($_->{"unit$mv"}*1e-3).' f'.$_->{Ix} } @rel_flows).