Changeset 201:b9158a014fe8 in lemon-0.x

Timestamp:

03/18/04 17:50:07 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@279

Message:

Alpár javaslatára készítettem egy struktúrát 2 dimenziós vektorok (síkvektorok) tárolására. Olyasmiket tud, amiket síkvektoroktól szeretnénk. A neve: xy, a hasonló nevu .h file-ban található.

Location:

src/work/athos

Files:

• makefile (modified) (1 diff)
• pf_demo.cc (modified) (2 diffs)
• xy/xy.cc (added)
• xy/xy.h (added)

src/work/athos/makefile

@@ -2 +2 @@
 CXX = g++-3.0
 
-pf_demo: pf_demo.cc ../marci_graph_traits.hh ../marci_list_graph.hh ../marci_property_vector.hh preflow_push.hh ../reverse_bfs.hh
+pf_demo: pf_demo.cc ../marci_graph_traits.hh ../list_graph.hh ../marci_property_vector.hh preflow_push.hh reverse_bfs.hh
         $(CXX) $(CXXFLAGS) -I. -I.. pf_demo.cc -o pf_demo 
 

src/work/athos/pf_demo.cc

@@ -24 +24 @@
   typedef ListGraph::SymEdgeIt SymEdgeIt;
   */
-  
+  ListGraph flowG;
+
+  /*
   //Marci példája
-  ListGraph flowG;
+
 
   NodeIt s=flowG.addNode();
@@ -59 +61 @@
   cap.set(v3_t, 20);
   cap.set(v4_t, 4);
+  */
 
 
+  //Ahuja könyv példája
 
+  NodeIt s=flowG.addNode();
+  NodeIt v2=flowG.addNode();
+  NodeIt v3=flowG.addNode();
+  NodeIt v4=flowG.addNode();
+  NodeIt v5=flowG.addNode();
+  NodeIt t=flowG.addNode();
 
-
-
-
-  /*
-  //Ahuja könyv példája
-  node_iterator s=flow_test.add_node();
-  NodeIt v2=flow_test.add_node();
-  NodeIt v3=flow_test.add_node();
-  NodeIt v4=flow_test.add_node();
-  NodeIt v5=flow_test.add_node();
-  NodeIt t=flow_test.add_node();
-  
-  node_property_vector<list_graph, std::string> node_name(flow_test);
-  node_name.put(s, "s");  
-  node_name.put(v2, "v2");
-  node_name.put(v3, "v3");
-  node_name.put(v4, "v4");
-  node_name.put(v5, "v5");
-  node_name.put(t, "t");
-
-  
-  edge_iterator s_v2=flow_test.add_edge(s, v2);
-  edge_iterator s_v3=flow_test.add_edge(s, v3);
-  
-  edge_iterator v2_v4=flow_test.add_edge(v2, v4);
-  edge_iterator v2_v5=flow_test.add_edge(v2, v5);
-
-  edge_iterator v3_v5=flow_test.add_edge(v3, v5);
-
-  edge_iterator v4_t=flow_test.add_edge(v4, t);
-  edge_iterator v5_t=flow_test.add_edge(v5, t);
+  EdgeIt s_v2=flowG.addEdge(s, v2);
+  EdgeIt s_v3=flowG.addEdge(s, v3);
+  EdgeIt v2_v4=flowG.addEdge(v2, v4);
+  EdgeIt v2_v5=flowG.addEdge(v2, v5);
+  EdgeIt v3_v5=flowG.addEdge(v3, v5);
+  EdgeIt v4_t=flowG.addEdge(v4, t);
+  EdgeIt v5_t=flowG.addEdge(v5, t);
   
   //Kis modositas
-  edge_iterator v2_s=flow_test.add_edge(v2, s);
+  //edge_iterator v2_s=flowG.add_edge(v2, s);
 
-  edge_property_vector<list_graph, int> cap(flow_test);  
-  cap.put(s_v2, 10);
-  cap.put(s_v3, 10);
-  cap.put(v2_v4, 5);
-  cap.put(v2_v5, 8);
-  cap.put(v3_v5, 5);
-  cap.put(v4_t, 8);
-  cap.put(v5_t, 8);
+  ListGraph::EdgeMap<int> cap(flowG);
+
+  cap.set(s_v2, 10);
+  cap.set(s_v3, 10);
+  cap.set(v2_v4, 5);
+  cap.set(v2_v5, 8);
+  cap.set(v3_v5, 5);
+  cap.set(v4_t, 8);
+  cap.set(v5_t, 8);
 
   //Kis modositas
-  cap.put(v2_s, 100);
-
-  //Kis modositas
-  //edge_iterator t_s=flow_test.add_edge(t, s);
-  //cap.put(t_s, 20);
-
-  */
+  //cap.put(v2_s, 100);
+