瀏覽代碼

vector net: implementation of turntable in library

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59562 15284696-431f-4ddb-bdfa-cd5b030d7da7
Štěpán Turek 11 年之前
父節點
當前提交
cf1f9cd61d
共有 3 個文件被更改,包括 1463 次插入517 次删除
  1. 8 4
      include/defs/vector.h
  2. 382 513
      lib/vector/Vlib/net.c
  3. 1073 0
      lib/vector/Vlib/net_build.c

+ 8 - 4
include/defs/vector.h

@@ -391,8 +391,12 @@ int Vect_graph_shortest_path(dglGraph_s *, int, int, struct ilist *, double *);
 /* Network (graph) */
 int Vect_net_build_graph(struct Map_info *, int, int, int, const char *,
                          const char *, const char *, int, int);
+int Vect_net_ttb_build_graph(struct Map_info *, int, int, int, int, int ,
+                            const char *, const char *, const char *, int, int);
 int Vect_net_shortest_path(struct Map_info *, int, int, struct ilist *,
                            double *);
+int Vect_net_ttb_shortest_path(struct Map_info *, int, int, int, int, int,
+                             struct ilist *, double *);
 dglGraph_s *Vect_net_get_graph(struct Map_info *);
 int Vect_net_get_line_cost(const struct Map_info *, int, int, double *);
 int Vect_net_get_node_cost(const struct Map_info *, int, double *);
@@ -401,12 +405,12 @@ int Vect_net_nearest_nodes(struct Map_info *, double, double, double, int,
                            struct line_pnts *, struct line_pnts *, double *);
 int Vect_net_shortest_path_coor(struct Map_info *, double, double, double,
                                 double, double, double, double, double,
-                                double *, struct line_pnts *, struct ilist *,
+                                double *, struct line_pnts *, struct ilist *,  struct ilist *,
                                 struct line_pnts *, struct line_pnts *,
                                 double *, double *);
-int Vect_net_shortest_path_coor2(struct Map_info *, double, double, double,
-                                double, double, double, double, double,
-                                double *, struct line_pnts *, struct ilist *, struct ilist *,
+int Vect_net_ttb_shortest_path_coor(struct Map_info *, double, double, double,
+                                double, double, double, double, double, int,
+                                double *, struct line_pnts *, struct ilist *,  struct ilist *,
                                 struct line_pnts *, struct line_pnts *,
                                 double *, double *);
 

File diff suppressed because it is too large
+ 382 - 513
lib/vector/Vlib/net.c


File diff suppressed because it is too large
+ 1073 - 0
lib/vector/Vlib/net_build.c