routesearch: rework some things, bugfixes

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

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 38dc6295e121548a478f3041fca0c56a2ede3168..66e36d905e7b8431acba4bce9b3f50075dd17bcb 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -7,6 +7,7 @@
    DF(sql)                                     \
    DF(sql2)                                    \
    DF(value)                                   \
+   DF(value2)                                  \
    DF(search)                                  \
    DF(filter)                                  \
    DF(check)                                   \
@@ -21,6 +22,8 @@ extern FILE *debug_file;
 #define DEBUG_DEV "/dev/stdout" /* just for glpk */
 
 
+#define GRANUS 3
+
 #define COUNTER_LIST                           \
    CTR(commodities_loaded)                     \
    CTR(trades_loaded)                          \
@@ -30,10 +33,10 @@ extern FILE *debug_file;
    CTR(routes_considered)                      \
    CTR(routes_wrongfinalelim)                  \
    CTR(routes_quickelim)                       \
-   CTR(routes_stratelim)                       \
+   CTR(routes_bucketelim)                      \
    CTR(routes_valued)                          \
    CTR(routes_wrongfinal)                      \
-   CTRA(newbests_strat,2)                      \
+   CTRA(newbests_granu,GRANUS*2)               \
    CTR(subroute_tails_valued)                  \
    CTR(subroutes_valued)                       \
    CTR(subroutes_nonempty)
@@ -118,13 +121,17 @@ void setup_value(void);
 
 typedef struct {
   double value[AP];
-  int ports[AP][MAX_ROUTELEN];
-} PotentialResult;
+  int ports[MAX_ROUTELEN];
+} OnePotentialResult;
+
+typedef struct {
+  OnePotentialResult prs[AP];
+} Bucket;
 
 void setup_search(void);
 void search(int start_isle, int final_isle /* -1 means any */,
-           PotentialResult ****strat_base_io
-               /* strat_base[finalarch][midarch]-> */);
+           Bucket ****buckets_base_io[GRANUS]
+               /* bucket_base[granui][finalthing][midthing]-> */);
 
 extern double max_mass, max_volu, max_capi;
 extern double distance_loss_factor_per_league;
@@ -138,6 +145,8 @@ extern int narches;
 extern char **archnames;
 extern int *islandid2arch;
 
+extern int granusz_fin[GRANUS], granusz_mid[GRANUS];
+
 
 extern FILE *output;
 
@@ -158,11 +167,12 @@ extern FILE *output;
 
 typedef struct {
   double value;
-  PotentialResult *pr;
+  Bucket *bucket;
 } HighScoreEntry;
 
-extern int nhighscores[AP];
-extern HighScoreEntry *highscores[AP];
+extern int granus;
+extern int nhighscores[GRANUS][AP];
+extern HighScoreEntry *highscores[GRANUS][AP];
 
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)                         \