Changeset 214:44f01e580f16 in lemon-0.x

Timestamp:

03/20/04 14:48:04 (21 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Feluton az uj map stilus fele.
Nehany const javitas.

Location:

src

Files:

• include/bin_heap.hh (modified) (2 diffs)
• work/bin_heap_demo.cc (modified) (4 diffs)

src/include/bin_heap.hh

@@ -109 +109 @@
     static int parent(int i) { return (i-1)/2; }
     static int second_child(int i) { return 2*i+2; }
-    bool less(const PairType &p1, const PairType &p2) {
+    bool less(const PairType &p1, const PairType &p2) const {
       return comp(p1.second, p2.second);
     }
@@ -157 +157 @@
     }
 
-    const Prio get(const Item &i) const {
+    Prio get(const Item &i) const {
       int idx = iim.get(i);
       return data[idx].second;
+    }
+    Prio operator[](const Item &i) const {
+      return get(i);
     }
     void set(const Item &i, const Prio &p) {

src/work/bin_heap_demo.cc

@@ -17 +17 @@
 
 class string_int_map : public map<string,int> {
+  typedef map<string,int> parent;
 public:
   int get(const string &s) {
@@ -22 +23 @@
     // hogy is mukodik ez a map :)
     if( count(s) == 0 ) {
-      operator[](s) = StrDoubleHeap::PRE_HEAP;
+      parent::operator[](s) = StrDoubleHeap::PRE_HEAP;
     }
-    return operator[](s);
+    return parent::operator[](s);
+  }
+  int operator[](const string &s) {
+    return get(s);
   }
   void set(const string &s, int i) {
-      operator[](s) = i;
+      parent::operator[](s) = i;
   }
 };
@@ -38 +42 @@
   
   cout << "testing string_int_map default value:\n";
-  cout << "  alma: " << sim.get("alma") << endl;
+  cout << "  sim.get(\"alma\"): " << sim.get("alma") << endl;
+  cout << "  sim[\"alma\"]: " << sim["alma"] << endl;
 
   cout << "creating the heap\n";
@@ -51 +56 @@
   cout << "heap.get(\"alma\") = " 
        << heap.get("alma")
+       << endl;
+  cout << "heap[\"alma\"] = " 
+       << heap["alma"]
        << endl;