routesearch: three different bucket sizes for better result sets

[ypp-sc-tools.db-test.git] / yarrg / rscommon.h

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 38dc6295e121548a478f3041fca0c56a2ede3168..9e1032a4053c7cade117cd0650f00855560ad597 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -121,10 +121,12 @@ typedef struct {
   int ports[AP][MAX_ROUTELEN];
 } PotentialResult;
 
+#define STRATS 3
+
 void setup_search(void);
 void search(int start_isle, int final_isle /* -1 means any */,
-           PotentialResult ****strat_base_io
-               /* strat_base[finalarch][midarch]-> */);
+           PotentialResult ****strat_base_io[STRATS]
+               /* strat_base[strati][finalthing][midthing]-> */);
 
 extern double max_mass, max_volu, max_capi;
 extern double distance_loss_factor_per_league;
@@ -138,6 +140,8 @@ extern int narches;
 extern char **archnames;
 extern int *islandid2arch;
 
+extern int stratsz_fin[STRATS], stratsz_mid[STRATS];
+
 
 extern FILE *output;
 
@@ -161,8 +165,9 @@ typedef struct {
   PotentialResult *pr;
 } HighScoreEntry;
 
-extern int nhighscores[AP];
-extern HighScoreEntry *highscores[AP];
+extern int minstrat;
+extern int nhighscores[STRATS][AP];
+extern HighScoreEntry *highscores[STRATS][AP];
 
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)                         \