Notice if $expected_total_profit parsing failed; don't break if it is an integer

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

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 84fad6fdb4e788d3cb2a3962734de063a71a4619..45a5b3129e141af8369576e059bb386b497d823f 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"
@@ -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,7 +170,7 @@ extern FILE *output;
 
 typedef struct {
   double value;
-  PotentialResult *pr;
+  Bucket *bucket;
 } HighScoreEntry;
 
 extern int granus;