浏览代码

netalib: revert https://trac.osgeo.org/grass/changeset/56890

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56896 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 12 年之前
父节点
当前提交
15e3f283f6
共有 1 个文件被更改,包括 3 次插入25 次删除
  1. 3 25
      lib/vector/neta/path.c

+ 3 - 25
lib/vector/neta/path.c

@@ -56,13 +56,13 @@ int NetA_distance_from_points(dglGraph_s *graph, struct ilist *from,
     for (i = 0; i < from->n_values; i++) {
 	int v = from->value[i];
 
-	if (dst[v] == -2)
+	if (dst[v] == 0)
 	    continue;		/*ingore duplicates */
-	dst[v] = -2;		/* make sure all from nodes are processed first */
+	dst[v] = 0;		/* make sure all from nodes are processed first */
 	dglHeapData_u heap_data;
 
 	heap_data.ul = v;
-	dglHeapInsertMin(&heap, -2, ' ', heap_data);
+	dglHeapInsertMin(&heap, 0, ' ', heap_data);
     }
     while (1) {
 	dglInt32_t v, dist;
@@ -82,18 +82,6 @@ int NetA_distance_from_points(dglGraph_s *graph, struct ilist *from,
 				dglNodeGet_OutEdgeset(graph,
 						      dglGetNode(graph, v)));
 
-	if (dglGet_NodeAttrSize(graph) > 0) {
-	    dglInt32_t ncost;
-	    
-	    memcpy(&ncost, dglNodeGet_Attr(graph, dglGetNode(graph, v)),
-		   sizeof(ncost));
-	    /* do not route paths through closed nodes */
-	    if (ncost < 0 && dist >= 0)
-		continue;
-
-	    dist += ncost;
-	}
-
 	for (edge = dglEdgeset_T_First(&et); edge;
 	     edge = dglEdgeset_T_Next(&et)) {
 	    dglInt32_t *to = dglEdgeGet_Tail(graph, edge);
@@ -162,16 +150,6 @@ int NetA_find_path(dglGraph_s * graph, int from, int to, int *edges,
 	    break;
 	dglInt32_t *edge, *node = dglGetNode(graph, vertex);
 
-
-	if (dglGet_NodeAttrSize(graph) > 0) {
-	    dglInt32_t ncost;
-	    
-	    memcpy(&ncost, dglNodeGet_Attr(graph, node), sizeof(ncost));
-	    /* do not route paths through closed nodes */
-	    if (ncost < 0 && vertex != from)
-		continue;
-	}
-
 	dglEdgeset_T_Initialize(&et, graph,
 				dglNodeGet_OutEdgeset(graph, node));
 	for (edge = dglEdgeset_T_First(&et); edge;