Changeset 558:4cbfb435ec2b in lemon-0.x for src/work

Timestamp:

05/06/04 19:22:11 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

random graph, random bipartite graph in jacint/graph_gen.h

Location:

src/work

Files:

• jacint/graph_gen.h (modified) (3 diffs)
• marci/bipartite_graph_wrapper.h (modified) (1 diff)
• marci/bipartite_matching_try_3.cc (modified) (5 diffs)

src/work/jacint/graph_gen.h

@@ -1 +1 @@
 // -*- c++ -*-
-//randomGraph(i,j) gives a random graph on i nodes and j edges.
 #include <vector>
 #include <cstdlib>
-
-//#include <list_graph.h>
-//#include <time_measure.h>
-//#include <for_each_macros.h>
-//#include <bfs_iterator.h>
-//#include <bipartite_graph_wrapper.h>
-//#include <maps.h>
-//#include <max_flow.h>
 
 namespace hugo {
@@ -39 +30 @@
 
 
+  /// Generates a random graph with n nodes and m edges.
+  /// Before generating the random graph, \c g.clear() is called.
   template<typename Graph>
-  void randomGraph (Graph& g, int n, int m) {
-    typedef typename Graph::Node Node;
+  void randomGraph(Graph& g, int n, int m) {
     g.clear();
-    std::vector<Node> nodes;
+    std::vector<typename Graph::Node> nodes;
     for (int i=0; i<n; ++i)
       nodes.push_back(g.addNode());
@@ -50 +42 @@
   }
 
-}
+  /// Generates a random bipartite graph with a and b nodes 
+  /// in the color classes and m edges.
+  /// According to the bipartite graph concept, the resulting 
+  /// graph is directed from the first class to the second one.
+  /// Before generating the random graph, \c g.clear() is called.
+  template<typename Graph>
+  void randomBipartiteGraph(Graph& g, int a, int b, int m) {
+    g.clear();
+    std::vector<typename Graph::Node> s_nodes;
+    std::vector<typename Graph::Node> t_nodes;
+    for (int i=0; i<a; ++i)
+      ///\bug g.addNode(g.S_CLASS) would be better.
+      s_nodes.push_back(g.addNode(false));
+    for (int i=0; i<b; ++i)
+      ///\bug g.addNode(g.T_CLASS) would be better.
+      t_nodes.push_back(g.addNode(true));
+    for (int i=0; i<m; ++i) 
+      g.addEdge(s_nodes[random(a)], t_nodes[random(b)]);
+  }
+
+} //namespace hugo

src/work/marci/bipartite_graph_wrapper.h

@@ -248 +248 @@
     
     void clear() {
-      FOR_EACH_LOC(typename Parent::EdgeIt, e, G) erase(e);
-      FOR_EACH_LOC(typename Parent::NodeIt, n, G) erase(n);
+      FOR_EACH_LOC(typename Parent::EdgeIt, e, *this) erase(e);
+      FOR_EACH_LOC(typename Parent::NodeIt, n, *this) erase(n);
     }
   };

src/work/marci/bipartite_matching_try_3.cc

@@ -3 +3 @@
 #include <fstream>
 #include <vector>
-#include <cstdlib>
 
 #include <list_graph.h>
@@ -14 +13 @@
 #include <hugo/maps.h>
 #include <max_flow.h>
+#include <graph_gen.h>
 
 using namespace hugo;
@@ -80 +80 @@
 };
 
-/**
- * Inicializalja a veletlenszamgeneratort.
- * Figyelem, ez nem jo igazi random szamokhoz,
- * erre ne bizzad a titkaidat!
- */
-void random_init()
-{
-        unsigned int seed = getpid();
-        seed |= seed << 15;
-        seed ^= time(0);
-
-        srand(seed);
-}
-
-/**
- * Egy veletlen int-et ad vissza 0 es m-1 kozott.
- */
-int random(int m)
-{
-  return int( double(m) * rand() / (RAND_MAX + 1.0) );
-}
 
 int main() {
@@ -113 +92 @@
 
   Graph g;
-
-  std::vector<Graph::Node> s_nodes;
-  std::vector<Graph::Node> t_nodes;
 
   int a;
@@ -128 +104 @@
   
   std::cout << "Generatig a random bipartite graph..." << std::endl;
-  for (int i=0; i<a; ++i) s_nodes.push_back(g.addNode(false));
-  for (int i=0; i<b; ++i) t_nodes.push_back(g.addNode(true));
-
   random_init();
-  for(int i=0; i<m; ++i) {
-    g.addEdge(s_nodes[random(a)], t_nodes[random(b)]);
-  }
+  randomBipartiteGraph(g, a, b, m);
 
 //   std::cout << "Edges of the bipartite graph:" << std::endl;