routesearch: make #define debug_flags work again, but still not faster

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

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index f02ffc0a4e6fc440592466d37f9405afd69ca133..1e6679db087035d3a8e7e9da964a94fa94f1ef45 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -7,12 +7,15 @@
    DF(sql)                                     \
    DF(sql2)                                    \
    DF(value)                                   \
+   DF(value2)                                  \
    DF(search)                                  \
    DF(filter)                                  \
    DF(check)                                   \
    DF(tableau)                                 \
    DF(lp)
 
+//#define debug_flags 0
+
 #define debug debug_file
 
 #include "common.h"
@@ -21,6 +24,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)                          \
@@ -33,7 +38,7 @@ extern FILE *debug_file;
    CTR(routes_bucketelim)                      \
    CTR(routes_valued)                          \
    CTR(routes_wrongfinal)                      \
-   CTRA(newbests_granu,2)                      \
+   CTRA(newbests_granu,GRANUS*2)               \
    CTR(subroute_tails_valued)                  \
    CTR(subroutes_valued)                       \
    CTR(subroutes_nonempty)
@@ -118,19 +123,21 @@ void setup_value(void);
 
 typedef struct {
   double value[AP];
-  int ports[AP][MAX_ROUTELEN];
-} PotentialResult;
+  int ports[MAX_ROUTELEN];
+} OnePotentialResult;
 
-#define GRANUS 3
+typedef struct {
+  OnePotentialResult prs[AP];
+} Bucket;
 
 void setup_search(void);
 void search(int start_isle, int final_isle /* -1 means any */,
-           PotentialResult ****buckets_base_io[GRANUS]
+           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;
-extern int max_dist;
+extern int max_dist, min_trade_maxprofit;
 
 #define LOSS_FACTOR_PER_DELAY_SLOT (1-1e-8)
 
@@ -162,10 +169,10 @@ extern FILE *output;
 
 typedef struct {
   double value;
-  PotentialResult *pr;
+  Bucket *bucket;
 } HighScoreEntry;
 
-extern int mingranu;
+extern int granus;
 extern int nhighscores[GRANUS][AP];
 extern HighScoreEntry *highscores[GRANUS][AP];