[GRASS-SVN] r36840 - grass/branches/releasebranch_6_4/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2009-04-21 07:09:01 -0400 (Tue, 21 Apr 2009)
New Revision: 36840

Modified:
   grass/branches/releasebranch_6_4/lib/vector/Vlib/net.c
Log:
dglib cache enabled again in 6.4

Modified: grass/branches/releasebranch_6_4/lib/vector/Vlib/net.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/Vlib/net.c	2009-04-21 11:03:43 UTC (rev 36839)
+++ grass/branches/releasebranch_6_4/lib/vector/Vlib/net.c	2009-04-21 11:09:01 UTC (rev 36840)
@@ -432,9 +432,8 @@
 	G_fatal_error(_("GngFlatten error"));
 
     /* init SP cache */
-    /* Disabled because of BUG1 in dglib. Without cache it is terribly slow, but with cache there
-     *  are too many errors. */
-    /* dglInitializeSPCache( gr, &(Map->spCache) ); */
+    /* disable to debug dglib cache */
+    dglInitializeSPCache(gr, &(Map->spCache));
 
     G_message(_("Graph was built"));
 
@@ -487,16 +486,22 @@
 
     pclip = NULL;
     if (List != NULL) {
-	/*nRet = dglShortestPath ( &(Map->graph), &pSPReport, from, to, clipper, pclip, &(Map->spCache)); */
 	nRet =
 	    dglShortestPath(&(Map->graph), &pSPReport, (dglInt32_t) from,
-			    (dglInt32_t) to, clipper, pclip, NULL);
+			    (dglInt32_t) to, clipper, pclip, &(Map->spCache));
+	/* comment out above and uncomment below to debug dglib cache */
+	/* nRet =
+	    dglShortestPath(&(Map->graph), &pSPReport, (dglInt32_t) from,
+			    (dglInt32_t) to, clipper, pclip, NULL); */
     }
     else {
-	/*nRet = dglShortestDistance ( &(Map->graph), &nDistance, from, to, clipper, pclip, &(Map->spCache)); */
 	nRet =
 	    dglShortestDistance(&(Map->graph), &nDistance, (dglInt32_t) from,
-				(dglInt32_t) to, clipper, pclip, NULL);
+				(dglInt32_t) to, clipper, pclip, &(Map->spCache));
+	/* comment out above and uncomment below to debug dglib cache */
+	/* nRet =
+	    dglShortestDistance(&(Map->graph), &nDistance, (dglInt32_t) from,
+				(dglInt32_t) to, clipper, pclip, NULL); */
     }
 
     if (nRet == 0) {