Changeset 201:879e47e5b731 in glemon-0.x for kruskalbox.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3431

Message:

Merge branches/akos to trunk.

File:

• kruskalbox.cc (modified) (2 diffs)

kruskalbox.cc

@@ -34 +34 @@
 {
   if(
-     tabcbt.get_active_text()!="" &&
-     (edgemapcbts[INPUT])->get_active_text()!="" &&
-     (edgemapcbts[OUTPUT])->get_active_text()!=""
-     )
+      tabcbt.get_active_text()!="" &&
+      (edgemapcbts[INPUT])->get_active_text()!="" &&
+      (edgemapcbts[OUTPUT])->get_active_text()!=""
+    )
+  {
+
+    const Graph &g=mapstorage->getGraph();
+    std::string input_map_name = edgemapcbts[INPUT]->get_active_text();
+    Graph::EdgeMap<bool> outputmap(g);
+    const MapStorage::NumericEdgeMap& inputmap=
+      mapstorage->getNumericEdgeMap(input_map_name);
+    double res=kruskal(g, inputmap, outputmap);
+
+    for (EdgeIt i(g); i!=INVALID; ++i)
     {
+      if(outputmap[i])
+      {
+        mapstorage->set(edgemapcbts[OUTPUT]->get_active_text(), i, 1.0);
+      }
+      else
+      {
+        mapstorage->set(edgemapcbts[OUTPUT]->get_active_text(), i, 0.0);
+      }
+    }
 
-      const Graph &g=mapstorage->graph;
-      Graph::EdgeMap<double> * inputmap=
-        ((mapstorage->edgemap_storage)[(edgemapcbts[INPUT])->get_active_text()]);
-      Graph::EdgeMap<bool> outputmap(g);
-      double res=kruskal(g, *inputmap, outputmap);
+    std::ostringstream o;
+    o << "Result: " << res;
+    resultlabel.set_text(o.str());
 
-      for (EdgeIt i(g); i!=INVALID; ++i)
-        {
-          if(outputmap[i])
-            {
-              (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
-                                               get_active_text()]))[i]=1;
-            }
-          else
-            {
-              (*((mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->
-                                               get_active_text()]))[i]=0;
-            }
-        }
+    mapstorage->mapChanged(true, (edgemapcbts[OUTPUT])->get_active_text());
+    //   mapstorage->changeActiveMap(true, E_COLOR,
+    //                        (edgemapcbts[OUTPUT])->get_active_text());
+    //   mapstorage->changeActiveMap(true, E_TEXT,
+    //                        (edgemapcbts[INPUT])->get_active_text());
 
-      std::ostringstream o;
-      o << "Result: " << res;
-      resultlabel.set_text(o.str());
-
-      mapstorage->mapChanged(true, (edgemapcbts[OUTPUT])->get_active_text());
-      //   mapstorage->changeActiveMap(true, E_COLOR,
-      //                              (edgemapcbts[OUTPUT])->get_active_text());
-      //   mapstorage->changeActiveMap(true, E_TEXT,
-      //                              (edgemapcbts[INPUT])->get_active_text());
-  
-    }
+  }
 }
     
@@ -77 +76 @@
   std::vector<std::string> empty_vector;
 
-  addMapSelector("Edgecosts: ", true);
-  addMapSelector("Edges of tree here: ", true);
+  addMapSelector("Edgecosts: ", true, NUM);
+  addMapSelector("Edges of tree here: ", true, NUM);
 
   resultlabel.set_text("Result: algorithm is not run yet.");