Changeset 201:879e47e5b731 in glemon-0.x for dijkstrabox.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:

• dijkstrabox.cc (modified) (6 diffs)

dijkstrabox.cc

@@ -51 +51 @@
     
 void DijkstraBox::run()
+{
+  if(
+      tabcbt.get_active_text()!="" &&
+      (edgemapcbts[INPUT])->get_active_text()!="" &&
+      (edgemapcbts[OUTPUT])->get_active_text()!="" &&
+      source.get_active_text()!="" &&
+      target.get_active_text()!=""
+    )
+  {
+    const Graph &g=mapstorage->graph;
+    Node from, to;
+
+    get_from_to(from, to, (Graph&)g);
+
+    std::ostringstream o;
+
+    if(!(from==to))
+    {
+      std::string inputmapName = edgemapcbts[INPUT]->get_active_text();
+      std::string outputmapName = edgemapcbts[OUTPUT]->get_active_text();
+
+      MapStorage::NumericEdgeMap& inputmap = mapstorage->getNumericEdgeMap(inputmapName);
+      MapStorage::NumericEdgeMap& outputmap = mapstorage->getNumericEdgeMap(outputmapName);
+
+      //zero out output map
+      for (EdgeIt i(g); i!=INVALID; ++i)
+      {
+        outputmap[i]=0;
+      }
+
+      Dijkstra<Graph, MapStorage::NumericEdgeMap > dijkstra(g, inputmap);
+      dijkstra.run(from, to);
+
+      if(dijkstra.reached(to))
+      {
+        Node n=to;
+        int length=0;
+        while (n!=INVALID && n!=from)
+        {
+          Edge e=dijkstra.predEdge(n);
+          outputmap[e]=1;
+          n=dijkstra.predNode(n);
+          length++;
+        }
+        o << "Result: " << length << " long path, with cost " << dijkstra.dist(to);
+      }
+      else
+      {
+        o << "Result: failed to find shortest path between ";
+        o << source.get_active_text() << " and " << target.get_active_text();
+      }
+      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());
+    }
+  }
+}
+
+void SuurballeBox::run()
 {
   if(
@@ -69 +132 @@
       if(!(from==to))
         {
-          Graph::EdgeMap<double> * inputmap=
-            (mapstorage->edgemap_storage)[(edgemapcbts[INPUT])->get_active_text()];
-          Graph::EdgeMap<double> * outputmap=
-            (mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->get_active_text()];
+          MapStorage::NumericEdgeMap& inputmap=
+            mapstorage->getNumericEdgeMap(edgemapcbts[INPUT]->get_active_text());
+          MapStorage::NumericEdgeMap& outputmap=
+            mapstorage->getNumericEdgeMap(edgemapcbts[OUTPUT]->get_active_text());
 
           //zero out output map
           for (EdgeIt i(g); i!=INVALID; ++i)
             {
-              (*outputmap)[i]=0;
+              outputmap[i]=0;
             }
           
-          Dijkstra<Graph, Graph::EdgeMap<double> > dijkstra(g, *inputmap);
-          dijkstra.run(from, to);
-          
-          if(dijkstra.reached(to))
-            {
-              Node n=to;
-              int length=0;
-              while (n!=INVALID && n!=from)
-                {
-                  Edge e=dijkstra.predEdge(n);
-                  (*outputmap)[e]=1;
-                  n=dijkstra.predNode(n);
-                  length++;
-                }
-              o << "Result: " << length << " long path, with cost " << dijkstra.dist(to);
-            }
-          else
-            {
-              o << "Result: failed to find shortest path between ";
-              o << source.get_active_text() << " and " << target.get_active_text();
-            }
-          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());
-        }
-    }
-}
-
-void SuurballeBox::run()
-{
-  if(
-     tabcbt.get_active_text()!="" &&
-     (edgemapcbts[INPUT])->get_active_text()!="" &&
-     (edgemapcbts[OUTPUT])->get_active_text()!="" &&
-     source.get_active_text()!="" &&
-     target.get_active_text()!=""
-     )
-    {
-      const Graph &g=mapstorage->graph;
-      Node from, to;
-
-      get_from_to(from, to, (Graph&)g);
-
-      std::ostringstream o;
-
-      if(!(from==to))
-        {
-          Graph::EdgeMap<double> * inputmap=
-            (mapstorage->edgemap_storage)[(edgemapcbts[INPUT])->get_active_text()];
-          Graph::EdgeMap<double> * outputmap=
-            (mapstorage->edgemap_storage)[(edgemapcbts[OUTPUT])->get_active_text()];
-
-          //zero out output map
-          for (EdgeIt i(g); i!=INVALID; ++i)
-            {
-              (*outputmap)[i]=0;
-            }
-          
-          Suurballe<Graph, Graph::EdgeMap<double> > sb((Graph&)g, *inputmap, from, to);
+          Suurballe<Graph, MapStorage::NumericEdgeMap > sb((Graph&)g, inputmap, from, to);
           
           int found=sb.run(num_set->get_value_as_int());
@@ -153 +154 @@
                   for(int k=0;k<path.length();k++)
                     {
-                      (*outputmap)[path.nth(k)]=j+1;
+                      outputmap[path.nth(k)]=j+1;
                     }
                 }
@@ -181 +182 @@
   signal_upon_maplist_updated().connect(sigc::mem_fun(*this, &DijkstraBox::maplists_updated));
 
-  addMapSelector("Cost map: ", true);
-  addMapSelector("Edges of path here: ", true);
+  addMapSelector("Cost map: ", true, NUM);
+  addMapSelector("Edges of path here: ", true, NUM);
 
   Gtk::Label * source_label=new Gtk::Label("Source: ");
@@ -213 +214 @@
         {
           std::ostringstream text;
-          text << (*((mapstorage->nodemap_storage)["label"]))[i];
+          text << mapstorage->getLabel(i);
           source.prepend_text(text.str());
           target.prepend_text(text.str());
@@ -226 +227 @@
     {
       std::ostringstream text;
-      text << (*((mapstorage->nodemap_storage)["label"]))[i];
+      text << mapstorage->getLabel(i);
       if(!(text.str().compare(source.get_active_text())))
         {