WIP routesearch; better debugging output

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

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index b1003bf2325c47b6bcf9ca68c5d3a94e4e99eede..d81551443a3269402f5d3208680c22b32be5a9ef 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -5,20 +5,29 @@
 
 #define DEBUG_FLAG_LIST                                \
    DF(sql)                                     \
-   DF(value)
+   DF(sql2)                                    \
+   DF(value)                                   \
+   DF(search)                                  \
+   DF(lp)
 
+#define debug stdout
+#define DEBUG_DEV "/dev/stdout"
 
-#define SQL_MUST( call ) ({                                     \
+#include "common.h"
+
+
+#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(sql)) fprintf(stderr,"SQL %s", sql_must_call_string);    \
+    if (DEBUGP(sql2)) fprintf(stderr,"SQL %s", sql_must_call_string);   \
     sqr= (call);                                                        \
-    if (DEBUGP(sql)) fprintf(stderr," = %d\n", sqr);                    \
-    if (sqr) fatal("SQL call failed code %d: %s: %s",                   \
-                  sqr, sqlite3_errmsg(db), sql_must_call_string);       \
-  })
+    if (DEBUGP(sql2)) fprintf(stderr," = %d\n", sqr);                   \
+    if (sqr) sql_fatal("(unknown)", sqr, sql_must_call_string);                 \
+  })                                                                    \
+
+void sql_fatal(const char *stmt_what, int sqr, const char *act_what) NORET;
 
 #define SQL_STEP(ssh) (sql_step_wrap((ssh), #ssh, __FILE__, __LINE__))
 int sql_step_wrap(sqlite3_stmt *ssh, const char *ssh_string,
@@ -26,20 +35,30 @@ int sql_step_wrap(sqlite3_stmt *ssh, const char *ssh_string,
 
 int sql_single_int(const char *stmt);
 
-#define MAX_ROUTELEN 20
+#define SQL_PREPARE(ss,stmt) ((ss)= sql_prepare((stmt),#ss))
+sqlite3_stmt *sql_prepare(const char *stmt, const char *what);
 
-#include "common.h"
+#define SQL_BIND(ss,index,value) (sql_bind((ss),(index),(value),#ss,#value))
+void sql_bind(sqlite3_stmt *ss, int index, int value,
+             const char *ss_what, const char *val_what);
+
+#define MAX_ROUTELEN 20
 
 extern sqlite3 *db;
 
-void setup(void);
-void value_route(int nislands, const int *islands);
+void setup_sql(void);
+double value_route(int nislands, const int *islands);
 void setup_value(void);
-void setup_commods(void);
+void setup_search(void);
+void search(int start_isle);
 
 extern double max_mass, max_volu, max_capi;
 extern double distance_loss_factor_per_league;
+extern int max_dist;
+
+#define LOSS_FACTOR_PER_DELAY_SLOT (1-1e-8)
+
+extern int islandtablesz;
 
-#define LOSS_FACTOR_PER_DELAY_SLOT (1-1e8)
 
 #endif /*RSCOMMON_H*/