X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=478b622d8dcef39acb7933de2231b0886e6539de;hp=36e6055b898610a3ccb2910e641203f9923bbddd;hb=3276ebe915a34abf34cf9639e83c85b8adac5245;hpb=fbe374c3592808f9b3f105ec0726b26ada6c0ea0;ds=sidebyside diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 36e6055..478b622 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -36,13 +36,18 @@ <%args> $quri $dbh +$baseqf $queryqf $islandstring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; +$minprofitstring => ''; $distance => ''; +$prselector +$someresults $emsgokorprint +$allargs <%perl> @@ -52,7 +57,9 @@ my $emsg; my @warningfs; my @islandids; -my $maxmaxdist=35; +my $destspec; + +my @maxmaxdist= qw(100 100 100); my $maxcpu=90; my $concur_lim=5; @@ -63,12 +70,18 @@ my $maxcountea=15; +

Find most profitable routes and trades

+% my $searchtype= $ARGS{RouteSearchType}; +% my $searchtype_show; +% % if ($qa->{Dropdowns}) { This feature is not available from the "drop down menus" interface. % } else { +% $prselector->('RouteSearchType'); +
<& enter_route, qa=>$qa, dbh=>$dbh, emsg_r=>\$emsg, warningfs_r=>\@warningfs, @@ -76,36 +89,69 @@ This feature is not available from the "drop down menus" interface. islandids_r => \@islandids, archipelagoes_r => undef &> +% if ($searchtype == 0) { +% $destspec= 'any'; +% $searchtype_show= 'open-ended'; +% } elsif ($searchtype == 1) { +% $destspec= 'circ'; +% $searchtype_show= 'circular'; +% } elsif ($searchtype == 2) { +% $searchtype_show= 'specific-destination'; + +Destination (one island only): +<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg, + thingstring => 'deststring', + prefix => 'ds', boxopts => 'size=40', + onresults => sub { +print STDERR "ONRESULTS @_\n"; + return unless @_; + my ($canonname, $island, $arch) = @{ $_[0] }; + die unless defined $island; + $destspec= $island; + } + &> + +% } else { +% die "$destspec ?"; +% } + <&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>     Maximum distance: - <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml', - thingstring => 'distance', emsgstore => \$emsg, - onresults => sub { ($maxdist)= @_; } &> - size=10 - + <& qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml', + thingstring => 'distance', emsgstore => \$emsg, boxopts => 'size=10', + onresults => sub { ($maxdist)= @_; } + &> - -% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; }; + +% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; }; <& "lookup:formhidden", ours => $ours &> % }
+
+
<%perl> +my $maxmaxdist= $maxmaxdist[$searchtype]; if (!$emsg && $maxdist > $maxmaxdist) { - $emsg= "Searching for routes of more than $maxmaxdist leagues is not". - " supported, sorry."; + $emsg= "Searching for $searchtype_show routes". + " of more than $maxmaxdist leagues is not". + " supported, sorry."; } -$emsgokorprint->($emsg) or return; -@islandids or return; -defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return; +print("
"), return + unless $emsgokorprint->($emsg) + and @islandids + and $allargs->{'submit'} + and defined $destspec + and (defined $routeparams->{MaxMass} or + defined $routeparams->{MaxVolume}); #---------- prepare island names ---------- @@ -135,8 +181,10 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { } push @rsargs, defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9; -push @rsargs, '0'; -push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids; +push @rsargs, $routeparams->{MinProfit} // 0; +push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea; +push @rsargs, $destspec; +push @rsargs, @islandids; m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs; @@ -198,10 +246,13 @@ while (<$fh>) { for ($i=1; $i < @i-1; $i++) { push @{ $item->{Vias} }, $i[$i]; } - my %linkqf= %$queryqf; + my %linkqf= (%$baseqf, %$queryqf); delete $linkqf{'query'}; $linkqf{'routestring'}= join ', ', @fi; $item->{Url}= $quri->(%linkqf); + $item->{ArchesString}= join ', ', @a; + $item->{ViasString}= join ' ', map { $_.',' } @{ $item->{Vias} }; + $item->{RouteSortString}= join ', ', @i; $results{$ap}{$isles}= $item; } @@ -214,7 +265,7 @@ if (!close $fh) { die $! if $!; die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/ -

Search took too long and was terminated

+% $someresults->('Search took too long and was terminated'); Sorry, but your query resulted in a search that took too long. Searches are limited to <% $maxcpu |h %> seconds of CPU time to @@ -222,16 +273,17 @@ avoid them consuming excessive resources on the server system, and to make sure that shorter searches can still happen.

-Please try a search with a smaller minimum distance, or place more +Please try a search with a smaller maximum distance, or place more restrictions on the route. + <%perl> return; } if ($concur_fail) { -

Server too busy

+% $someresults->('Server too busy'); Sorry, but there are already <% $concur_lim |h %> route searches running. We limit the number which can run at once to avoid @@ -240,7 +292,7 @@ YARRG website still runs quickly.

If you submitted several searches and gave up on them (eg by hitting -`back' or `stop' in your browser), be aware that that doesn't +"back" or "stop" in your browser), be aware that that doesn't generally stop the search process at the server end. So it's best to avoid asking for large searches that you're not sure about. @@ -248,10 +300,13 @@ avoid asking for large searches that you're not sure about. Otherwise, please try later. Searches are limited to <% $maxcpu |h %> seconds of CPU time so more processing resources should be available soon. + <%perl> return; } +$someresults->(); + % foreach my $ap (qw(A P)) { % if ($ap eq 'A') { @@ -259,44 +314,66 @@ seconds of CPU time so more processing resources should be available soon. % } else {

Best routes for profit per league

% } - +
- + +% my $ci=0; +% my $rowid= "r${ap}$isles"; $rowid =~ y/ /_/; +% foreach my $k (qw(A P Leagues ArchesString +% Start RouteSortString Finish)) { +% $sortkeys{$ci}{$rowid}= $item->{$k}; +% $ci++; +% } + % $datarow ^= 1; % } # $isles
Profit Dist. Archipelagoes -Route + +Route +
Abs. Per.lg. - +(link to plan) Start Via Finish -
% my $datarow=0; +% my %sortkeys; % foreach my $isles (sort { % $results{$ap}{$b}{$ap} <=> % $results{$ap}{$a}{$ap} % } keys %{$results{$ap}}) { % my $item= $results{$ap}{$isles}; -
<% $item->{A} |h %> <% $item->{P} |h %> <% $item->{Leagues} |h %> -<% join ', ', @{ $item->{Archs} } |h %> +<% + $item->{ArchesString} |h %> <% $item->{Start} |h %>, -<% join ' ', map { $_.',' } @{ $item->{Vias} } |h %> +<% $item->{ViasString} |h %> <% $item->{Finish} |h %>
+<&| tabsort, table => "ap${ap}_table", sortkeys => "ap${ap}_sortkeys", + throw => "ap${ap}_sortrow", rowclass => "datarow", cols => [ + { DoReverse => 1, Numeric => 1 }, + { DoReverse => 1, Numeric => 1 }, + { DoReverse => 1, Numeric => 1 }, + { }, + { }, + { }, + { }, + ] &> + ap<% $ap %>_sortkeys= <% to_json_protecttags(\%sortkeys) %>; + % } # $ap

@@ -304,11 +381,8 @@ seconds of CPU time so more processing resources should be available soon.

Notes

Per league values count each island visited as one -(additional) league; the `Dist.' column is however the actual distance +(additional) league; the "Dist." column is however the actual distance to be sailed. All profit figures are somewhat approximate; get a complete trading plan for a route for accurate information. -<%perl> - - - +