[GRASS-SVN] r63723 - in grass/trunk: lib/gis vector/v.net.alloc vector/v.net.iso vector/v.net.salesman

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-24 05:19:38 -0800 (Wed, 24 Dec 2014)
New Revision: 63723

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/vector/v.net.alloc/main.c
   grass/trunk/vector/v.net.alloc/v.net.alloc.html
   grass/trunk/vector/v.net.iso/main.c
   grass/trunk/vector/v.net.iso/v.net.iso.html
   grass/trunk/vector/v.net.salesman/main.c
   grass/trunk/vector/v.net.salesman/v.net.salesman.html
Log:
v.net: ccats -> center_cats (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 13:19:38 UTC (rev 63723)
@@ -445,6 +445,7 @@
 v.net.alloc|alayer:arc_layer
 v.net.alloc|nlayer:node_layer
 v.net.alloc|type:arc_type
+v.net.alloc|ccats:center_cats
 # v.net.allpairs
 v.net.allpairs|alayer:arc_layer
 v.net.allpairs|nlayer:node_layer
@@ -471,6 +472,7 @@
 v.net.iso|alayer:arc_layer
 v.net.iso|nlayer:node_layer
 v.net.iso|type:arc_type
+v.net.iso|ccats:center_cats
 # v.net.path
 v.net.path|alayer:arc_layer
 v.net.path|nlayer:node_layer
@@ -479,6 +481,7 @@
 v.net.salesman|alayer:arc_layer
 v.net.salesman|nlayer:node_layer
 v.net.salesman|type:arc_type
+v.net.salesman|ccats:center_cats
 # v.net.spanningtree
 v.net.spanningtree|alayer:arc_layer
 v.net.spanningtree|nlayer:node_layer

Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.alloc/main.c	2014-12-24 13:19:38 UTC (rev 63723)
@@ -75,7 +75,7 @@
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description =
 	_("Categories of centers (points on nodes) to which net "

Modified: grass/trunk/vector/v.net.alloc/v.net.alloc.html
===================================================================
--- grass/trunk/vector/v.net.alloc/v.net.alloc.html	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.alloc/v.net.alloc.html	2014-12-24 13:19:38 UTC (rev 63723)
@@ -63,7 +63,7 @@
 v.net myroads points=centernodes out=myroads_net op=connect thresh=200
 
 # allocate, specifying range of center cats (easier to catch all):
-v.net.alloc myroads_net out=myroads_net_alloc ccats=1-100000 node_layer=2
+v.net.alloc myroads_net out=myroads_net_alloc center_cats=1-100000 node_layer=2
 
 # report categories
 v.category myroads_net_alloc option=report
@@ -131,7 +131,7 @@
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # subnetwork allocation with fastest paths
-v.net.alloc in=myroads_net_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost out=myroads_net_alloc_time ccats=1-3
+v.net.alloc in=myroads_net_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost out=myroads_net_alloc_time center_cats=1-3
 </pre></div>
 
 To display the result, run for example:

Modified: grass/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.iso/main.c	2014-12-24 13:19:38 UTC (rev 63723)
@@ -83,7 +83,7 @@
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description =
 	_("Categories of centers (points on nodes) to which net "

Modified: grass/trunk/vector/v.net.iso/v.net.iso.html
===================================================================
--- grass/trunk/vector/v.net.iso/v.net.iso.html	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.iso/v.net.iso.html	2014-12-24 13:19:38 UTC (rev 63723)
@@ -62,7 +62,7 @@
 v.net myroads points=startnode out=myroads_net op=connect thresh=200
 
 # define iso networks using distance:
-v.net.iso input=myroads_net output=myroads_net_iso ccats=1-100000 costs=1000,2000,5000
+v.net.iso input=myroads_net output=myroads_net_iso center_cats=1-100000 costs=1000,2000,5000
 </pre></div>
 
 The network is divided into 4 categories:
@@ -135,7 +135,7 @@
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # define iso networks using traveling time:
-v.net.iso input=myroads_net_time output=myroads_net_iso_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost ccats=1-100000 costs=1,2,5
+v.net.iso input=myroads_net_time output=myroads_net_iso_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost center_cats=1-100000 costs=1,2,5
 </pre></div>
 
 To display the result, run for example:

Modified: grass/trunk/vector/v.net.salesman/main.c
===================================================================
--- grass/trunk/vector/v.net.salesman/main.c	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.salesman/main.c	2014-12-24 13:19:38 UTC (rev 63723)
@@ -137,7 +137,7 @@
     output = G_define_standard_option(G_OPT_V_OUTPUT);
 
     term_opt = G_define_standard_option(G_OPT_V_CATS);
-    term_opt->key = "ccats";
+    term_opt->key = "center_cats";
     term_opt->required = YES;
     term_opt->description = _("Categories of points ('cities') on nodes "
 			      "(layer is specified by nlayer)");

Modified: grass/trunk/vector/v.net.salesman/v.net.salesman.html
===================================================================
--- grass/trunk/vector/v.net.salesman/v.net.salesman.html	2014-12-24 13:06:56 UTC (rev 63722)
+++ grass/trunk/vector/v.net.salesman/v.net.salesman.html	2014-12-24 13:19:38 UTC (rev 63723)
@@ -83,7 +83,7 @@
 # point          6          1          5
 
 # find the shortest path
-v.net.salesman myroads_net ccats=1-6 out=mysalesman_distance
+v.net.salesman myroads_net center_cats=1-6 out=mysalesman_distance
 
 # set up costs as traveling time
 
@@ -115,7 +115,7 @@
 v.db.update myroads_net_time layer=3 col=bcost val="length / speed * 60"
 
 # find the fastest path
-v.net.salesman myroads_net_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost ccats=1-6 out=mysalesman_time
+v.net.salesman myroads_net_time arc_layer=3 node_layer=2 afcol=cost abcol=bcost center_cats=1-6 out=mysalesman_time
 </pre></div>
 
 To display the result, run for example: