Changeset 1879:01d41844ef46 in lemon-0.x

Timestamp:

01/05/06 17:54:34 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Kruskal algorithm can be run from GUI from now on.

Location:

gui

Files:

• algobox.cc (modified) (2 diffs)
• algobox.h (modified) (1 diff)
• algowin.cc (modified) (1 diff)
• algowin.h (modified) (2 diffs)
• graph_displayer_canvas-event.cc (modified) (1 diff)
• kruskalbox.cc (modified) (2 diffs)
• kruskalbox.h (modified) (1 diff)
• new_map_win.cc (modified) (4 diffs)

gui/algobox.cc

@@ -60 +60 @@
 }
 
-void AlgoBox::update_maplist( void * ms)
+void AlgoBox::update_maplist(MapStorage * ms)
 {
-  mapstorage=(MapStorage *)ms;
+  mapstorage=ms;
   std::vector<std::string> nml;
   std::vector<std::string> eml;
@@ -70 +70 @@
       mapstorage->signal_edge_map_ch().connect(sigc::mem_fun(*this, &AlgoBox::edgemaplist_changed));
       nml=mapstorage->getNodeMapList();
-      eml=mapstorage->getNodeMapList();
+      eml=mapstorage->getEdgeMapList();
     }
   for(int i=0;i<(int)nodemapcbts.size();i++)

gui/algobox.h

@@ -34 +34 @@
 
   void update_tablist( std::vector< std::string > tl );
-  void update_maplist( void * );
+  void update_maplist( MapStorage * );
 
   void nodemaplist_changed(std::string);

gui/algowin.cc

@@ -72 +72 @@
 }
 
-void AlgoWin::update_maplist(void * mapstorage)
+void AlgoWin::update_maplist(MapStorage * mapstorage)
 {
   ab->update_maplist(mapstorage);

gui/algowin.h

@@ -7 +7 @@
 
 #include <all_include.h>
+//#include <mapstorage.h>
 #include <algobox.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
+
+class MapStorage;
 
 enum {GENERAL, KRUSKAL, ALGO_NUM}; // algorithm IDs;
@@ -35 +38 @@
 
   void update_tablist(std::vector<std::string> tabnames);
-  void update_maplist( void *);
+  void update_maplist(MapStorage *);
 
   void on_hide();

gui/graph_displayer_canvas-event.cc

@@ -851 +851 @@
         }
     }
-
-}
-
-int GraphDisplayerCanvas::addNewEdgeMap(double default_value, std::string mapname)
-{
-  //create the new map
-  Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> ((mytab.mapstorage).graph, default_value);
-
-  //if addition was not successful addEdgeMap returns one.
-  //cause can be that there is already a map named like the new one
-  if((mytab.mapstorage).addEdgeMap(mapname,emptr, default_value))
-    {
-      return 1;
-    }
-
-
-  //add it to the list of the displayable maps
-  mytab.registerNewEdgeMap(mapname);
-
-  //display it
-  changeEdgeText(mapname);
-
-  return 0;
-}
-
-int GraphDisplayerCanvas::addNewNodeMap(double default_value, std::string mapname)
-{
-  //create the new map
-  Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> ((mytab.mapstorage).graph,default_value);
-
-  //if addition was not successful addNodeMap returns one.
-  //cause can be that there is already a map named like the new one
-  if((mytab.mapstorage).addNodeMap(mapname,emptr, default_value))
-    {
-      return 1;
-    }
-
-  //add it to the list of the displayable maps
-  mytab.registerNewNodeMap(mapname);
-
-  //display it
-  changeNodeText(mapname);
-
-  return 0;
-}
-
+}

gui/kruskalbox.cc

@@ -1 +1 @@
 #include <kruskalbox.h>
+
+enum {INPUT, OUTPUT, MAP_NUM};
 
 KruskalBox::KruskalBox(std::vector<std::string> t):AlgoBox()
@@ -8 +10 @@
 void KruskalBox::run()
 {
-  
-  std::cout << "Kruskal inditasa, de meg nincsen keszen." << std::endl;
+  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);
+
+  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;
+      }
+  }
+
+  std::ostringstream o;
+  o << "Result: " << res;
+  resultlabel.set_text(o.str());
+
+  mapstorage->changeActiveMap(true, E_COLOR, (edgemapcbts[OUTPUT])->get_active_text());
+  mapstorage->changeActiveMap(true, E_TEXT, (edgemapcbts[INPUT])->get_active_text());
 }
     
 void KruskalBox::build_box()
 {
-  edgemapcbts.resize(1);
-  Gtk::HBox * hbox=new Gtk::HBox();
+  edgemapcbts.resize(MAP_NUM);
+  Gtk::HBox * hbox;
 
-  std::ostringstream o;
-  o << "Edgecosts: ";
-  label=new Gtk::Label(o.str());
+  hbox=new Gtk::HBox();
+
+  label=new Gtk::Label("Edgecosts: ");
 
   edgemapcbts[0]=new Gtk::ComboBoxText();
 
   hbox->pack_start(*label);
-  hbox->pack_start(*(edgemapcbts[0]));
+  hbox->pack_start(*(edgemapcbts[INPUT]));
   pack_start(*hbox);
+
+  hbox=new Gtk::HBox();
+
+  label=new Gtk::Label("Edges of tree here: ");
+
+  edgemapcbts[1]=new Gtk::ComboBoxText();
+
+  hbox->pack_start(*label);
+  hbox->pack_start(*(edgemapcbts[OUTPUT]));
+  pack_start(*hbox);
+
+  resultlabel.set_text("Result: algorithm is not run yet.");
+  pack_start(resultlabel);
 }

gui/kruskalbox.h

@@ -14 +14 @@
 class KruskalBox : public AlgoBox
 {
+  Gtk::Label resultlabel;
+
 public:
   KruskalBox(std::vector<std::string> t);

gui/new_map_win.cc

@@ -121 +121 @@
                                 }
                               polishstack.push(atof(def_val_ch));
+                              delete def_val_ch;
                             }
                           operation=false;
@@ -165 +166 @@
               //display it
               //gdc.changeEdgeText(mapname);
+
+              //delete emptr;
             }
           else //!edge.get_active()
@@ -205 +208 @@
                                 }
                               polishstack.push(atof(def_val_ch));
+                              delete def_val_ch;
                             }
                           operation=false;
@@ -249 +253 @@
               //display it
               //gdc.changeNodeText(mapname);
+
+              //delete emptr;
             }
           if(!abortion)