Changeset 64:7a32d528857f in glemon-0.x for mapstorage.cc

Timestamp:

08/23/05 17:57:12 (19 years ago)

Author:

Akos Ladanyi

Branch:

gui

Phase:

public

Convert:

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

Message:

• handle the case when there is no id map in the edgeset section
• do not use ListGraph?.id() to determine the id of a new node/edge

File:

• mapstorage.cc (modified) (6 diffs)

mapstorage.cc

@@ -12 +12 @@
   nodemap_storage["id"] = new Graph::NodeMap<double>(graph);
   edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
+
+  nodemap_default["id"] = 1.0;
+  edgemap_default["id"] = 1.0;
 }
 
@@ -126 +129 @@
   bool read_x = false;
   bool read_y = false;
+  bool read_edge_id = false;
 
   try {
@@ -183 +187 @@
   }
 
+  if (!read_edge_id)
+  {
+    edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
+    int i = 1;
+    for (EdgeIt e(graph); e != INVALID; ++e)
+    {
+      (*edgemap_storage["id"])[e] = i++;
+    }
+  }
+
   if (!read_x || !read_y)
   {
@@ -211 +225 @@
       nodemap_default[it->first] = 0.0;
     }
+    else if (it->first == "id")
+    {
+      NodeIt n(graph);
+      double max = (*nodemap_storage["id"])[n];
+      for (; n != INVALID; ++n)
+      {
+        if ((*nodemap_storage["id"])[n] > max)
+          max = (*nodemap_storage["id"])[n];
+      }
+      nodemap_default["id"] = max + 1.0;
+    }
   }
   for (std::map<std::string, Graph::EdgeMap<double>*>::const_iterator it =
@@ -218 +243 @@
     {
       edgemap_default[it->first] = 0.0;
+    }
+    else
+    {
+      EdgeIt e(graph);
+      double max = (*edgemap_storage["id"])[e];
+      for (; e != INVALID; ++e)
+      {
+        if ((*edgemap_storage["id"])[e] > max)
+          max = (*edgemap_storage["id"])[e];
+      }
+      edgemap_default["id"] = max + 1.0;
     }
   }
@@ -268 +304 @@
       nodemap_default.begin(); it != nodemap_default.end(); ++it)
   {
-    nodemap_default.erase(it);
+    if (it->first != "id")
+      nodemap_default.erase(it);
   }
   for (std::map<std::string, double>::iterator it =
       edgemap_default.begin(); it != edgemap_default.end(); ++it)
   {
-    edgemap_default.erase(it);
+    if (it->first != "id")
+      edgemap_default.erase(it);
   }
   graph.clear();