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=d91765e83b4b8ed0d5426897a69fc784d499dc9a;hp=a9bca8c1fdadc87dfab844bcde2f28d9f4fe8350;hb=2388148ea6c557995767e4391088838946c2f238;hpb=1170fca71dcf10ed2d046fc22f8f1a63ac2ce5cb

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index a9bca8c..d91765e 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -30,9 +30,34 @@
 
 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,
-		  const char *file, int line);
+#define SQL_STEP(ssh) (sql_step((ssh), #ssh, __FILE__, __LINE__))
+int sql_step(sqlite3_stmt *ssh, const char *ssh_string,
+	     const char *file, int line);
+
+#define SQL_DISTINCT_DECL(cols, nintcols)	\
+  int cols[nintcols];				\
+  cols[0]= -1;
+#define SQL_DISTINCT_STEP(ssh, cols, nkeycols)				 \
+  (sql_step_distinct((ssh), #ssh, __FILE__, __LINE__,			 \
+		     (cols), sizeof((cols))/sizeof((cols)[0]), nkeycols))
+int sql_step_distinct(sqlite3_stmt *ssh, const char *ssh_string,
+		      const char *file, int line,
+		      int *cols, int ncols, int nkeycols);
+   /* These work if we're making a query whose columns consist of:
+    *  - keys: integer column(s) on which the results are sorted by the query
+    *  - consequences: zero or more integer cols strictly dependent on the keys
+    *  - extra: zero or more further (possibly non-integer) columns
+    *
+    * Call SQL_DISTINCT_DECL, passing intcols = the total number of keys and
+    * consequences; it will declare  int cols[intfields];
+    *
+    * Then each SQL_DISTINCT_STEP is like SQL_STEP only you have to
+    * pass the number of key columns and it only returns rows with
+    * distinct keys.  Rows with all-identical keys are asserted to
+    * have identical consequences.  After each call to
+    * SQL_DISTINCT_STEP the keys and consequences will be stored in
+    * cols.
+    */
 
 int sql_single_int(const char *stmt);
 
@@ -48,8 +73,19 @@ void sql_bind(sqlite3_stmt *ss, int index, int value,
 extern sqlite3 *db;
 
 void setup_sql(void);
-double value_route(int nislands, const int *islands);
+
+
+typedef struct {
+  double distance_loss_factor;
+  struct TradesBlock *trades;
+  double route_tail_value;
+} IslandPair;
+
+IslandPair *ipair_get(int si, int di);
+
+double value_route(int nislands, const int *islands, int exclude_arbitrage);
 void setup_value(void);
+
 void setup_search(void);
 void search(int start_isle);