Compress flow ids

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 8475f689d4bb31b3bc452d5a99eccf163a7895f9..cfffd146af3548c87efcccde44ea0b2db3090c8a 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -139,7 +139,7 @@ foreach my $var (keys %ARGS) {
                        islandid \d |
                        archipelago \d |
                        debug |
                        islandid \d |
                        archipelago \d |
                        debug |

-                       rtsel[ag]_\w+
+                       [RT]\w+

                    )$/x;
        my $val= $ARGS{$var};
        next if $val eq 'none';
                    )$/x;
        my $val= $ARGS{$var};
        next if $val eq 'none';

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 18c3ecb1390af1f2d3a3fc4f2108d2a64f5c90ce..adcb89deea5b2a7af860c79b5c9403756a811158 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -166,7 +166,7 @@ function ms_Setarch(dd) {
 % } #---------- end of dropdowns, now common middle of page code ----------
 
 <input type=submit name=submit value="Go">
 % } #---------- end of dropdowns, now common middle of page code ----------
 
 <input type=submit name=submit value="Go">

-% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring|^rtsel[ag]_/; };
+% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring|^[RT]/; };

 <& "lookup:formhidden", ours => $ours &>
 
 <%perl>
 <& "lookup:formhidden", ours => $ours &>
 
 <%perl>

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index dcf3671620f32b8680c7375b6d714e911442ed0d..e200aa5cfd78e7643297dfb350f73f2320b0b640 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -186,13 +186,66 @@ push @columns,                 qw(commodname
        foreach my $od (qw(org dst)) {
                push @uid,
                        $f->{"${od}_id"},
        foreach my $od (qw(org dst)) {
                push @uid,
                        $f->{"${od}_id"},

-                       $f->{"${od}_price"},
-                       $f->{"${od}_stallid"};
+                       $f->{"${od}_price"};
+               push @uid,
+                       $f->{"${od}_stallid"}
+                               if $qa->{ShowStalls};

        }
        }

-       $f->{Uid}= join '_', @uid;
+       $f->{UidLong}= join '_', @uid;
+
+       my $base= 31;
+       my $cmpu= '';
+       map {
+               my $uue= $_;
+               my $first= $base;
+               do {
+                       my $this= $uue % $base;
+print STDERR "uue=$uue this=$this ";
+                       $uue -= $this;
+                       $uue /= $base;
+                       $this += $first;
+                       $first= 0;
+                       $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;
+               } while ($uue);
+               $cmpu;
+       } @uid;
+       $f->{UidShort}= $cmpu;
+
+       if ($qa->{'debug'}) {
+               my @outuid;
+               $_= $f->{UidShort};
+               my $mul;
+               while (m/./) {
+                       my $v= m/^[a-z]/ ? ord($&)-ord('a') :
+                              m/^[A-Z]/ ? ord($&)-ord('A')+26 :
+                              m/^[0-9]/ ? ord($&)-ord('0')+52 :
+                              die "$_ ?";
+                       if ($v >= $base) {
+                               push @outuid, 0;
+                               $v -= $base;
+                               $mul= 1;
+#print STDERR "(next)\n";
+                       }
+                       die "$f->{UidShort} $_ ?" unless defined $mul;
+                       $outuid[$#outuid] += $v * $mul;

 
 

-       if ($qa->{"rtsela_$f->{Uid}"} &&
-           !$qa->{"rtselg_$f->{Uid}"}) {
+#print STDERR "$f->{UidShort}  $_  $&  v=$v  mul=$mul  ord()=".ord($&).
+#                      "[vs.".ord('a').",".ord('A').",".ord('0')."]".
+#                      "  outuid=@outuid\n";
+
+                       $mul *= $base;
+                       s/^.//;
+               }
+               my $recons_long= join '_', @outuid;
+               $f->{UidLong} eq $recons_long or
+                       die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
+       }
+
+       if ($qa->{"R$f->{UidShort}"} && !$qa->{"T$f->{UidShort}"}) {

                $f->{Suppress}= 1;
        }
 
                $f->{Suppress}= 1;
        }
 


@@ -228,7 +281,7 @@ Maximize
 
   totalprofit:
                   ".(join " +
 
   totalprofit:
                   ".(join " +

-                  ", map { "$_->{unit_profit} $_->{Var}" } @flows)."
+                  ", map { "$_->{unitprofit} $_->{Var}" } @flows)."

 
 Subject To
 ";
 
 Subject To
 ";


@@ -311,8 +364,6 @@ if ($qa->{'debug'}) {
        die unless $found_section;
 };
 
        die unless $found_section;
 };
 

-print join ' ', map { $_->{Optimal} } @flows;
-

 push @columns, qw(OptQty OptCapital OptProfit);
 
 </%perl>
 push @columns, qw(OptQty OptCapital OptProfit);
 
 </%perl>


@@ -359,8 +410,8 @@ push @columns, qw(OptQty OptCapital OptProfit);
 
 % foreach my $flow (@flows) {
 <tr>
 
 % foreach my $flow (@flows) {
 <tr>

-<td><input type=hidden   name=rtsela_<% $flow->{Uid} %> value=1>
-    <input type=checkbox name=rtselg_<% $flow->{Uid} %> value=1
+<td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
+    <input type=checkbox name=T<% $flow->{UidShort} %> value=""

        <% $flow->{Suppress} ? '' : 'checked' %> >
 %      foreach my $col (@columns) {
 <td><% $flow->{$col} |h %>
        <% $flow->{Suppress} ? '' : 'checked' %> >
 %      foreach my $col (@columns) {
 <td><% $flow->{$col} |h %>