X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=38dc6295e121548a478f3041fca0c56a2ede3168;hp=0933e0fecc9565b2368ebb0d3f4b55284aff5f6b;hb=8ee07d9a86ecdf73fd959ae88173b176cdac2305;hpb=706d75804688b94f51b806adc44f10269c35b0db

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 0933e0f..38dc629 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -10,13 +10,16 @@
    DF(search)					\
    DF(filter)					\
    DF(check)					\
+   DF(tableau)					\
    DF(lp)
 
-#define debug stdout
-#define DEBUG_DEV "/dev/stdout"
+#define debug debug_file
 
 #include "common.h"
 
+extern FILE *debug_file;
+#define DEBUG_DEV "/dev/stdout" /* just for glpk */
+
 
 #define COUNTER_LIST				\
    CTR(commodities_loaded)			\
@@ -25,26 +28,29 @@
    CTR(ipairs_relevant)				\
    CTR(quantities_loaded)			\
    CTR(routes_considered)			\
+   CTR(routes_wrongfinalelim)			\
    CTR(routes_quickelim)			\
    CTR(routes_stratelim)			\
    CTR(routes_valued)				\
-   CTR(newbests_strat_absolute)			\
-   CTR(newbests_strat_perleague)			\
+   CTR(routes_wrongfinal)			\
+   CTRA(newbests_strat,2)			\
    CTR(subroute_tails_valued)			\
    CTR(subroutes_valued)			\
    CTR(subroutes_nonempty)
-#define CTR(x) extern int ctr_##x;
+#define CTR(x)    extern int ctr_##x;
+#define CTRA(x,n) extern int ctr_##x[n];
   COUNTER_LIST
 #undef CTR
+#undef CTRA
 
 #define SQL_MUST( call ) ({						 \
     /* `call' is an expression returning result, using  const char *sqe; \
      * chk1 and chk2 are blocks using sqe and  int sqr; */		 \
     const char *sql_must_call_string= #call;				 \
     int sqr;								 \
-    if (DEBUGP(sql2)) fprintf(stderr,"SQL %s", sql_must_call_string);	 \
+    if (DEBUGP(sql2)) fprintf(debug,"SQL %s", sql_must_call_string);	 \
     sqr= (call);							 \
-    if (DEBUGP(sql2)) fprintf(stderr," = %d\n", sqr);			 \
+    if (DEBUGP(sql2)) fprintf(debug," = %d\n", sqr);			 \
     if (sqr) sql_fatal("(unknown)", sqr, sql_must_call_string);		 \
   })									 \
 
@@ -92,7 +98,7 @@ void sql_bind(sqlite3_stmt *ss, int index, int value,
 
 extern sqlite3 *db;
 
-void setup_sql(void);
+void setup_sql(const char *database);
 
 
 typedef struct {
@@ -106,14 +112,19 @@ IslandPair *ipair_get_maybe(int si, int di);
 double value_route(int nislands, const int *islands, int exclude_arbitrage);
 void setup_value(void);
 
+#define AP 2 /* 0=absolute, 1=perleague */
+#define A 0
+#define P 1
+
 typedef struct {
-  double absolute, perleague;
-  int absolute_ports[MAX_ROUTELEN], perleague_ports[MAX_ROUTELEN];
+  double value[AP];
+  int ports[AP][MAX_ROUTELEN];
 } PotentialResult;
 
 void setup_search(void);
-void search(int start_isle, PotentialResult ****strat_base_io
-                                /* strat_base[finalarch][midarch]-> */);
+void search(int start_isle, int final_isle /* -1 means any */,
+	    PotentialResult ****strat_base_io
+	        /* strat_base[finalarch][midarch]-> */);
 
 extern double max_mass, max_volu, max_capi;
 extern double distance_loss_factor_per_league;
@@ -128,6 +139,9 @@ extern char **archnames;
 extern int *islandid2arch;
 
 
+extern FILE *output;
+
+
 #define NEW(ptr) ((ptr)= mmalloc(sizeof(*ptr)))
 
 #define MCALLOC(array, count) ((array)= mcalloc(sizeof(*(array)) * (count)))
@@ -147,9 +161,8 @@ typedef struct {
   PotentialResult *pr;
 } HighScoreEntry;
 
-extern int nhighscores_absolute, nhighscores_perleague;
-extern HighScoreEntry *highscores_absolute;
-extern HighScoreEntry *highscores_perleague;
+extern int nhighscores[AP];
+extern HighScoreEntry *highscores[AP];
 
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)			     \