Changeset 1414:01d9d6bc1284 in lemon-0.x

Timestamp:

05/14/05 19:20:40 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Handling simultan edge adding.
Fixed bug: directed edge maps for undir graphs

Location:

src/lemon/bits

Files:

• alteration_notifier.h (modified) (10 diffs)
• array_map.h (modified) (12 diffs)
• erasable_graph_extender.h (modified) (2 diffs)
• extendable_graph_extender.h (modified) (1 diff)

src/lemon/bits/alteration_notifier.h

@@ -30 +30 @@
   /// @{
 
-  /// Registry class to register objects observes alterations in the graph.
-
+  /// \brief Registry class to register objects observes alterations in 
+  /// the graph.
+  ///
   /// This class is a registry for the objects which observe the
   /// alterations in a container. The alteration observers can be attached
@@ -39 +40 @@
   ///
   /// The most important application of the alteration observing is the
-  /// dynamic map implementation when the observers are observing the
-  /// alterations in the graph.
+  /// dynamic map implementation.
   ///
   /// \param _Item The item type what the observers are observing, usually
@@ -75 +75 @@
       friend class AlterationNotifier;
 
-      /// Default constructor.
-
+      /// \brief Default constructor.
+      ///
       /// Default constructor for ObserverBase.
       /// 
@@ -83 +83 @@
       virtual ~ObserverBase() {}
 
-      /// Attaches the observer into an AlterationNotifier.
-
+      /// \brief Attaches the observer into an AlterationNotifier.
+      ///
       /// This member attaches the observer into an AlterationNotifier.
       ///
@@ -92 +92 @@
       }
 
-      /// Detaches the observer into an AlterationNotifier.
-
+      /// \brief Detaches the observer into an AlterationNotifier.
+      ///
       /// This member detaches the observer from an AlterationNotifier.
       ///
@@ -132 +132 @@
       /// subclasses.
         
-      virtual void add(const Item&) = 0;        
-
+      virtual void add(const Item&) = 0;
+
+      /// \brief The member function to notificate the observer about 
+      /// simulitem is added to the container.
+      ///
+      /// The add() member function notificates the observer about an item
+      /// is added to the container. It have to be overrided in the
+      /// subclasses.
+
+      virtual void add(const std::vector<Item>& items) {
+        for (int i = 0; i < (int)items.size(); ++i) {
+          add(items[i]);
+        }
+      }
 
       /// \brief The member function to notificate the observer about an
@@ -143 +155 @@
         
       virtual void erase(const Item&) = 0;
+
+      virtual void erase(const std::vector<Item>& items) {
+        for (int i = 0; i < (int)items.size(); ++i) {
+          add(items[i]);
+        }
+      }
 
       /// \brief The member function to notificate the observer about the
@@ -229 +247 @@
   public:
         
-    /// Notifies all the registered observers about an Item added to the container.
-                
-    /// It notifies all the registered observers about an Item added to the container.
+    /// \brief Notifies all the registered observers about an Item added to 
+    /// the container.
+    ///
+    /// It notifies all the registered observers about an Item added to 
+    /// the container.
     /// 
-    void add(const Item& key) {
-      typename Container::iterator it;
-      for (it = container.begin(); it != container.end(); ++it) {
-        (*it)->add(key);
+    void add(const Item& item) {
+      typename Container::iterator it;
+      for (it = container.begin(); it != container.end(); ++it) {
+        (*it)->add(item);
       }
     }   
 
-    /// Notifies all the registered observers about an Item erased from the container.
-                
-    /// It notifies all the registered observers about an Item erased from the container.
+    /// \brief Notifies all the registered observers about more Item added to 
+    /// the container.
+    ///
+    /// It notifies all the registered observers about more Item added to 
+    /// the container.
+    /// 
+    void add(const std::vector<Item>& items) {
+      typename Container::iterator it;
+      for (it = container.begin(); it != container.end(); ++it) {
+        (*it)->add(items);
+      }
+    }   
+
+    /// \brief Notifies all the registered observers about an Item erased from 
+    /// the container.
+    /// 
+    /// It notifies all the registered observers about an Item erased from 
+    /// the container.
     /// 
     void erase(const Item& key) {
@@ -250 +285 @@
       }
     }
+
+    /// \brief Notifies all the registered observers about more Item erased  
+    /// from the container.
+    /// 
+    /// It notifies all the registered observers about more Item erased from 
+    /// the container.
+    /// 
+    void erase(const std::vector<Item>& items) {
+      typename Container::iterator it;
+      for (it = container.begin(); it != container.end(); ++it) {
+        (*it)->erase(items);
+      }
+    }
     
 
-    /// Notifies all the registered observers about the container is built.
-                
+    /// \brief Notifies all the registered observers about the container is 
+    /// built.
+    ///         
     /// Notifies all the registered observers about the container is built
     /// from an empty container.
@@ -264 +313 @@
 
 
-    /// Notifies all the registered observers about all Items are erased.
-
+    /// \brief Notifies all the registered observers about all Items are 
+    /// erased.
+    ///
     /// Notifies all the registered observers about all Items are erased
     /// from the container.

src/lemon/bits/array_map.h

@@ -1 +1 @@
 /* -*- C++ -*-
- * src/lemon/array_map.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/bits/array_map.h - Part of LEMON, a generic C++ optimization library
  *
  * Copyright (C) 2005 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -32 +32 @@
   /// @{
         
-  /** The ArrayMap template class is graph map structure what
-   *  automatically updates the map when a key is added to or erased from
-   *  the map. This map factory uses the allocators to implement 
-   *  the container functionality.
-   *
-   *  The template parameter is the AlterationNotifier that the maps
-   *  will belong to and the Value.
-   */
+  /// The ArrayMap template class is graph map structure what
+  /// automatically updates the map when a key is added to or erased from
+  /// the map. This map factory uses the allocators to implement 
+  /// the container functionality.
+  ///
+  /// The template parameter is the AlterationNotifier that the maps
+  /// will belong to and the Value.
+   
 
   template <typename _Graph, 
@@ -69 +69 @@
   public:
 
-    /** Graph and Registry initialized map constructor.
-     */
+    /// Graph and Registry initialized map constructor.
+     
     ArrayMap(const Graph& _g) : graph(&_g) {
       Item it;
@@ -95 +95 @@
     }
 
-    /** Constructor to copy a map of the same map type.
-     */
+    /// Constructor to copy a map of the same map type.
+     
     ArrayMap(const ArrayMap& copy) : Parent() {
       if (copy.attached()) {
@@ -115 +115 @@
     using Parent::attached;
 
-    /** Assign operator to copy a map of the same map type.
-     */
+    /// Assign operator to copy a map of the same map type.
+     
     ArrayMap& operator=(const ArrayMap& copy) {
       if (&copy == this) return *this;
@@ -142 +142 @@
     }
 
-    /** The destructor of the map.
-     */
+    /// The destructor of the map.
+     
     virtual ~ArrayMap() {      
       if (attached()) {
@@ -152 +152 @@
         
         
-    /**
-     * The subscript operator. The map can be subscripted by the
-     * actual keys of the graph. 
-     */
+    ///The subscript operator. The map can be subscripted by the
+    ///actual keys of the graph. 
+     
     Value& operator[](const Key& key) {
       int id = graph->id(key);
@@ -161 +160 @@
     } 
                 
-    /**
-     * The const subscript operator. The map can be subscripted by the
-     * actual keys of the graph. 
-     */
+
+    ///The const subscript operator. The map can be subscripted by the
+    ///actual keys of the graph. 
+     
     const Value& operator[](const Key& key) const {
       int id = graph->id(key);
@@ -170 +169 @@
     }
         
-    /** Setter function of the map. Equivalent with map[key] = val.
-     *  This is a compatibility feature with the not dereferable maps.
-     */
+    /// Setter function of the map. Equivalent with map[key] = val.
+    /// This is a compatibility feature with the not dereferable maps.
+     
     void set(const Key& key, const Value& val) {
       (*this)[key] = val;
     }
                 
-    /** Add a new key to the map. It called by the map registry.
-     */
+    /// Add a new key to the map. It called by the map registry.
+     
     void add(const Key& key) {
       int id = graph->id(key);
@@ -201 +200 @@
       allocator.construct(&(values[id]), Value());
     }
-                
-    /** Erase a key from the map. It called by the map registry.
-     */
+
+    void add(const std::vector<Key>& keys) {
+      int max_id = -1;
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        int id = graph->id(keys[i]);
+        if (id > max_id) {
+          max_id = id;
+        }
+      }
+      if (max_id >= capacity) {
+        int new_capacity = (capacity == 0 ? 1 : capacity);
+        while (new_capacity <= max_id) {
+          new_capacity <<= 1;
+        }
+        Value* new_values = allocator.allocate(new_capacity);
+        Item it;
+        for (graph->first(it); it != INVALID; graph->next(it)) {
+          int id = graph->id(it);
+          bool found = false;
+          for (int i = 0; i < (int)keys.size(); ++i) {
+            int jd = graph->id(keys[i]);
+            if (id == jd) {
+              found = true;
+              break;
+            }
+          }
+          if (found) continue;
+          allocator.construct(&(new_values[id]), values[id]);
+          allocator.destroy(&(values[id]));
+        }
+        if (capacity != 0) allocator.deallocate(values, capacity);
+        values = new_values;
+        capacity = new_capacity;
+      }
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        int id = graph->id(keys[i]);
+        allocator.construct(&(values[id]), Value());
+      }
+    }
+                
+    /// Erase a key from the map. It called by the map registry.
+     
     void erase(const Key& key) {
       int id = graph->id(key);
       allocator.destroy(&(values[id]));
+    }
+
+    void erase(const std::vector<Key>& keys) {
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        int id = graph->id(keys[i]);
+        allocator.destroy(&(values[id]));
+      }
     }
 
@@ -222 +267 @@
         Item it;
         for (graph->first(it); it != INVALID; graph->next(it)) {
-          int id = graph->id(it);;
+          int id = graph->id(it);
           allocator.destroy(&(values[id]));
         }                                                               
@@ -233 +278 @@
       return graph;
     }
-
-//     /// The stl compatible pair iterator of the map.
-//     typedef MapIterator<ArrayMap> Iterator;
-//     /// The stl compatible const pair iterator of the map.
-//     typedef MapConstIterator<ArrayMap> ConstIterator;
-
-//     /** Returns the begin iterator of the map.
-//      */
-//     Iterator begin() {
-//       return Iterator(*this, KeyIt(*MapBase::getGraph()));
-//     }
-
-//     /** Returns the end iterator of the map.
-//      */
-//     Iterator end() {
-//       return Iterator(*this, INVALID);
-//     }
-
-//     /** Returns the begin ConstIterator of the map.
-//      */
-//     ConstIterator begin() const {
-//       return ConstIterator(*this, KeyIt(*MapBase::getGraph()));
-//     }
-
-//     /** Returns the end const_iterator of the map.
-//      */
-//     ConstIterator end() const {
-//       return ConstIterator(*this, INVALID);
-//     }
-
-//     /// The KeySet of the Map.
-//     typedef MapConstKeySet<ArrayMap> ConstKeySet;
-
-//     /// KeySet getter function.
-//     ConstKeySet keySet() const {
-//       return ConstKeySet(*this); 
-//     }
-
-//     /// The ConstValueSet of the Map.
-//     typedef MapConstValueSet<ArrayMap> ConstValueSet;
-
-//     /// ConstValueSet getter function.
-//     ConstValueSet valueSet() const {
-//       return ConstValueSet(*this);
-//     }
-
-//     /// The ValueSet of the Map.
-//     typedef MapValueSet<ArrayMap> ValueSet;
-
-//     /// ValueSet getter function.
-//     ValueSet valueSet() {
-//       return ValueSet(*this);
-//     }
 
   private:

src/lemon/bits/erasable_graph_extender.h

@@ -3 +3 @@
 #ifndef LEMON_ERASABLE_GRAPH_EXTENDER_H
 #define LEMON_ERASABLE_GRAPH_EXTENDER_H
+
+#include <vector>
 
 #include <lemon/invalid.h>
@@ -68 +70 @@
     
     void erase(const UndirEdge& uedge) {
-      Parent::getNotifier(Edge()).erase(Edge(uedge,true));
-      Parent::getNotifier(Edge()).erase(Edge(uedge,false));
+      std::vector<Edge> edges;
+      edges.push_back(Edge(uedge,true));
+      edges.push_back(Edge(uedge,false));
+      Parent::getNotifier(Edge()).erase(edges);
       Parent::getNotifier(UndirEdge()).erase(uedge);
       Parent::erase(uedge);

src/lemon/bits/extendable_graph_extender.h

@@ -51 +51 @@
       Parent::getNotifier(UndirEdge()).add(uedge);
 
-      Edge edge_forward(uedge, true);
-      Edge edge_backward(uedge, false);
-      Parent::getNotifier(Edge()).add(edge_forward);
-      Parent::getNotifier(Edge()).add(edge_backward);
+      std::vector<Edge> edges;
+      edges.push_back(Edge(uedge, true));
+      edges.push_back(Edge(uedge, false));
+      Parent::getNotifier(Edge()).add(edges);
 
       return uedge;