Changeset 136

Timestamp:

03/23/08 12:13:02 (8 months ago)

Author:

anton

Message:

rule parsing fixed

Files:

• trunk/core/src/shooting_star_boost_wrapper.cpp (modified) (4 diffs)
• trunk/core/src/shooting_star.c (modified) (15 diffs)

trunk/core/src/shooting_star_boost_wrapper.cpp

@@ -290 +290 @@
-  {
-    *err_msg = "Source edge not found";
-1
+2
-  }
-
@@ -308 +308 @@
-  {
-    *err_msg = "Target edge not found";
-1
+3
-  }
-
@@ -359 +359 @@
-          {
-            *err_msg = "Overflow";
-1
+4
-          }
-      }
@@ -386 +386 @@
-  }
-
+  *err_msg = "Target was not reached";
+  return -1;
+
-}
-

trunk/core/src/shooting_star.c

@@ -189 +189 @@
-  int t;
-
+  DBG("fetching\n");
+
-  for(t=0; t<MAX_RULE_LENGTH;++t)
-    target_edge->rule[t] = -1;
-    
+  DBG("rule reset\n");
+
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->id, &isnull);
-  if (isnull)
-    elog(ERROR, "id contains a null value");
-  target_edge->id = DatumGetInt32(binval);
+  DBG("id: %i\n", target_edge->id);
-  
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->source, &isnull);
@@ -201 +206 @@
-    elog(ERROR, "source contains a null value");
-  target_edge->source = DatumGetInt32(binval);
+  DBG("source: %i\n", target_edge->source);
-
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->target, &isnull);
@@ -206 +212 @@
-    elog(ERROR, "target contains a null value");
-  target_edge->target = DatumGetInt32(binval);
+  DBG("target: %i\n", target_edge->target);
-
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->cost, &isnull);
@@ -211 +218 @@
-    elog(ERROR, "cost contains a null value");
-  target_edge->cost = DatumGetFloat8(binval);
+  DBG("cost: %f\n", target_edge->cost);
-
-  if (edge_columns->reverse_cost != -1) 
@@ -219 +227 @@
-        elog(ERROR, "reverse_cost contains a null value");
-      target_edge->reverse_cost =  DatumGetFloat8(binval);
+      DBG("r_cost: %f\n", target_edge->reverse_cost);
+
-    }
-
@@ -225 +235 @@
-    elog(ERROR, "source x contains a null value");
-  target_edge->s_x = DatumGetFloat8(binval);
+  DBG("s_x: %f\n", target_edge->s_x);
-
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->s_y, &isnull);
@@ -230 +241 @@
-    elog(ERROR, "source y contains a null value");
-  target_edge->s_y = DatumGetFloat8(binval);
+  DBG("s_y: %f\n", target_edge->s_y);
-  
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->t_x, &isnull);
@@ -235 +247 @@
-    elog(ERROR, "target x contains a null value");
-  target_edge->t_x = DatumGetFloat8(binval);
+  DBG("t_x: %f\n", target_edge->t_x);
-  
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->t_y, &isnull);
@@ -240 +253 @@
-    elog(ERROR, "target y contains a null value");
-  target_edge->t_y = DatumGetFloat8(binval);
+  DBG("t_y: %f\n", target_edge->t_y);
-
-  binval = SPI_getbinval(*tuple, *tupdesc, edge_columns->to_cost, &isnull);
-  if (isnull)
-
-
+
-  else
-    target_edge->to_cost = DatumGetFloat8(binval);
+  DBG("to_cost: %f\n", target_edge->to_cost);
-
-  char *str = DatumGetCString(SPI_getvalue(*tuple, *tupdesc, edge_columns->rule));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  int ci = MAX_RULE_LENGTH;
-
-
-
+
+
+
-  while (pch != NULL)
-  {
@@ -261 +289 @@
-    pch = (char *)strtok (NULL, " ,");
-  }
-
+
+
-}
-
@@ -329 +358 @@
-        }
-        
-       //
+//     
-
-      ntuples = SPI_processed;
+      DBG("ntuples = %i", ntuples);
+
-      total_tuples += ntuples;
-
-
+
+
+
+
-        edges = palloc(total_tuples * sizeof(edge_shooting_star_t));
-      else
-        edges = repalloc(edges, total_tuples * sizeof(edge_shooting_star_t));
+
+      DBG("memory for more %i ntuples allocated", ntuples);
-
-      if (edges == NULL) 
@@ -349 +384 @@
-          int t;
-          SPITupleTable *tuptable = SPI_tuptable;
+      DBG("tuptable", ntuples);
-          TupleDesc tupdesc = SPI_tuptable->tupdesc;
+
+      DBG("tupdesc", ntuples);
-          
-          for (t = 0; t < ntuples; t++) 
-            {
-              HeapTuple tuple = tuptable->vals[t];
+      DBG("tuple", ntuples);
-              fetch_edge_shooting_star(&tuple, &tupdesc, &edge_columns, 
-                               &edges[total_tuples - ntuples + t]);
+      DBG("fetch", ntuples);
-            }
-          SPI_freetuptable(tuptable);
+      DBG("freetuptable", ntuples);
-        } 
-      else 
@@ -366 +407 @@
-    
-      
-%i
+<%i>
-
-    
@@ -419 +460 @@
-  //time_t stime = time(NULL);    
-
+  DBG("ret =  %i\n",ret);
+
-  ret = boost_shooting_star(edges, total_tuples, source_edge_id, 
-                    target_edge_id,
@@ -437 +480 @@
-      ereport(ERROR, (errcode(ERRCODE_E_R_E_CONTAINING_SQL_NOT_PERMITTED), 
-        errmsg("Error computing path: %s", err_msg)));
+//        errmsg("Error computing path: %i", ret)));
-    } 
-  return finish(SPIcode, ret);