X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=45a5b3129e141af8369576e059bb386b497d823f;hp=f086e57d29c23ca45ea34e89fd00de1461e99552;hb=8cbcdefaf39ea525ea12957a115b8d78d88566c4;hpb=d14a97ff4e453ad1540a02b465bb7e398303edde

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index f086e57..45a5b31 100644
--- 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"
@@ -120,17 +123,22 @@ void setup_value(void);
 
 typedef struct {
   double value[AP];
-  int ports[AP][MAX_ROUTELEN];
-} PotentialResult;
+  int length;
+  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 ****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 +170,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];