# HG changeset patch
# User jacint
# Date 1079029040 0
# Node ID 9091b1ebca27a29665a12283595a4023ebb5563f
# Parent  940b13aba5ffe560d0477b2af88ebf178e7c4de9
*** empty log message ***

diff -r 940b13aba5ff -r 9091b1ebca27 src/work/jacint/bin_heap.hh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/work/jacint/bin_heap.hh	Thu Mar 11 18:17:20 2004 +0000
@@ -0,0 +1,232 @@
+/* FIXME: Copyright ... 
+ *
+ * This implementation is heavily based on STL's heap functions and
+ * the similar class by Alpar Juttner in IKTA...
+ */
+
+/******
+ *
+ * BinHeap<KeyType, ValueType, KeyIntMap, [ValueCompare]>
+ *
+ * Ez az osztaly kulcs-ertek parok tarolasara alkalmas binaris kupacot
+ * valosit meg.
+ * A kupacban legfolul mindig az a par talalhato, amiben az _ertek_ a
+ * legkisebb. (Gondolj a Dijkstra pont-tavolsag kupacara; igazabol ahhoz
+ * lett keszitve...)
+ *
+ * Megjegyzes: egy kicsit gyanus nekem, hogy a kupacos temakorben nem
+ * azt hivjak kulcsnak, amit most en annak nevezek. :) En olyan 
+ * property_map -os ertelemben hasznalom.
+ *
+ * A hasznalatahoz szukseg van egy irhato/olvashato property_map-re, ami
+ * a kulcsokhoz egy int-et tud tarolni (ezzel tudom megkeresni az illeto
+ * elemet a kupacban a csokkentes es hasonlo muveletekhez).
+ * A map-re csak referenciat tarol, ugy hogy a kupac elete folyan a map-nek
+ * is elnie kell. (???)
+ *
+ * Ketfele modon hasznalhato:
+ * Lusta mod:
+ * put(Key, Value) metodussal pakolunk a kupacba,
+ * aztan o majd eldonti, hogy ez az elem mar benne van-e es ha igen, akkor
+ * csokkentettunk-e rajta, vagy noveltunk.
+ * Ehhez nagyon fontos, hogy az atadott property map inicializalva legyen
+ * minden szobajovo kulcs ertekre, -1 -es ertekkel!
+ * Es ilyen esetben a kulcsokrol lekerdezheto az allapotuk a state metodussal:
+ * (nem jart meg a kupacban PRE_HEAP=-1, epp a kupacban van IN_HEAP=0,
+ *  mar kikerult a kupacbol POST_HEAP=-2).
+ * Szoval ebben a modban a kupac nagyjabol hasznalhato property_map-kent, csak
+ * meg meg tudja mondani a "legkisebb" erteku elemet. De csak nagyjabol,
+ * hiszen a kupacbol kikerult elemeknek elvesz az ertekuk...
+ *
+ * Kozvetlen mod:
+ * push(Key, Value) metodussal belerakunk a kupacba (ha az illeto kulcs mar
+ * benn volt, akkor gaz).
+ * increase/decrease(Key k, Value new_value) metodusokkal lehet
+ * novelni/csokkenteni az illeto kulcshoz tartozo erteket. (Ha nem volt meg
+ * benne a kupacban az illeto kulcs, vagy nem abba az iranyba valtoztattad
+ * az erteket, amerre mondtad -- gaz).
+ *
+ * Termeszetesen a fenti ket modot ertelemszeruen lehet keverni.
+ * Ja es mindig nagyon gaz, ha belepiszkalsz a map-be, amit a kupac
+ * hasznal. :-))
+ *
+ *
+ * Bocs, most faradt vagyok, majd egyszer leforditom. (Misi)
+ *
+ */
+
+
+#ifndef BIN_HEAP_HH
+#define BIN_HEAP_HH
+
+#include <vector>
+#include <utility>
+#include <functional>
+
+namespace hugo {
+
+  template <typename Key, typename Val, typename KeyIntMap,
+	    typename Compare = std::less<Val> >
+  class BinHeap {
+
+  public:
+    typedef Key	             KeyType;
+    // FIXME: stl-ben nem ezt hivjak value_type -nak, hanem a kovetkezot...
+    typedef Val              ValueType;
+    typedef std::pair<KeyType,ValueType>     PairType;
+    typedef KeyIntMap        KeyIntMapType;
+    typedef Compare          ValueCompare;
+
+    /**
+     * Each Key element have a state associated to it. It may be "in heap",
+     * "pre heap" or "post heap". The later two are indifferent from the
+     * heap's point of view, but may be useful to the user.
+     *
+     * The KeyIntMap _should_ be initialized in such way, that it maps
+     * PRE_HEAP (-1) to any element to be put in the heap...
+     */
+    enum state_enum {
+      IN_HEAP = 0,
+      PRE_HEAP = -1,
+      POST_HEAP = -2
+    };
+
+  private:
+    std::vector<PairType> data;
+    Compare comp;
+    // FIXME: jo ez igy???
+    KeyIntMap &kim;
+
+  public:
+    BinHeap(KeyIntMap &_kim) : kim(_kim) {}
+    BinHeap(KeyIntMap &_kim, const Compare &_comp) : comp(_comp), kim(_kim) {}
+
+
+    int size() const { return data.size(); }
+    bool empty() const { return data.empty(); }
+
+  private:
+    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) {
+      return comp(p1.second, p2.second);
+    }
+
+    int bubble_up(int hole, PairType p);
+    int bubble_down(int hole, PairType p, int length);
+
+    void move(const PairType &p, int i) {
+      data[i] = p;
+      kim.set(p.first, i);
+    }
+
+    void rmidx(int h) {
+      int n = data.size()-1;
+      if( h>=0 && h<=n ) {
+	kim.set(data[h].first, POST_HEAP);
+	if ( h<n ) {
+	  bubble_down(h, data[n], n);
+	}
+	data.pop_back();
+      }
+    }
+
+  public:
+    void push(const PairType &p) {
+      int n = data.size();
+      data.resize(n+1);
+      bubble_up(n, p);
+    }
+    void push(const Key &k, const Val &v) { push(PairType(k,v)); }
+
+    Key top() const {
+      // FIXME: test size>0 ?
+      return data[0].first;
+    }
+    Val topValue() const {
+      // FIXME: test size>0 ?
+      return data[0].second;
+    }
+
+    void pop() {
+      rmidx(0);
+    }
+
+    void erase(const Key &k) {
+      rmidx(kim.get(k));
+    }
+
+    const Val get(const Key &k) const {
+      int idx = kim.get(k);
+      return data[idx].second;
+    }
+    void put(const Key &k, const Val &v) {
+      int idx = kim.get(k);
+      if( idx < 0 ) {
+	push(k,v);
+      }
+      else if( comp(v, data[idx].second) ) {
+	bubble_up(idx, PairType(k,v));
+      }
+      else {
+	bubble_down(idx, PairType(k,v), data.size());
+      }
+    }
+
+    void decrease(const Key &k, const Val &v) {
+      int idx = kim.get(k);
+      bubble_up(idx, PairType(k,v));
+    }
+    void increase(const Key &k, const Val &v) {
+      int idx = kim.get(k);
+      bubble_down(idx, PairType(k,v), data.size());
+    }
+
+    state_enum state(const Key &k) const {
+      int s = kim.get(k);
+      if( s>=0 )
+	s=0;
+      return state_enum(s);
+    }
+
+  }; // class BinHeap
+
+  
+  template <typename K, typename V, typename M, typename C>
+  int BinHeap<K,V,M,C>::bubble_up(int hole, PairType p) {
+    int par = parent(hole);
+    while( hole>0 && less(p,data[par]) ) {
+      move(data[par],hole);
+      hole = par;
+      par = parent(hole);
+    }
+    move(p, hole);
+    return hole;
+  }
+
+  template <typename K, typename V, typename M, typename C>
+  int BinHeap<K,V,M,C>::bubble_down(int hole, PairType p, int length) {
+    int child = second_child(hole);
+    while(child < length) {
+      if( less(data[child-1], data[child]) ) {
+	--child;
+      }
+      if( !less(data[child], p) )
+	goto ok;
+      move(data[child], hole);
+      hole = child;
+      child = second_child(hole);
+    }
+    child--;
+    if( child<length && less(data[child], p) ) {
+      move(data[child], hole);
+      hole=child;
+    }
+  ok:
+    move(p, hole);
+    return hole;
+  }
+
+} // namespace hugo
+
+#endif // BIN_HEAP_HH
diff -r 940b13aba5ff -r 9091b1ebca27 src/work/jacint/dijkstra.cc
--- a/src/work/jacint/dijkstra.cc	Thu Mar 11 15:57:17 2004 +0000
+++ b/src/work/jacint/dijkstra.cc	Thu Mar 11 18:17:20 2004 +0000
@@ -6,11 +6,15 @@
 #include <dijkstra.h>
 #include <time_measure.h>
 
+#include <bin_heap.hh>
+#include <fib_heap.h>
+
 using namespace hugo;
 
 int main(int, char **) {
   typedef ListGraph::NodeIt NodeIt;
-  typedef ListGraph::EachEdgeIt EachEdgeIt;
+  typedef ListGraph::EachNodeIt EachNodeIt;
+  typedef ListGraph::InEdgeIt InEdgeIt; 
 
   ListGraph G;
   NodeIt s, t;
@@ -20,24 +24,65 @@
   std::cout << "dijkstra demo ..." << std::endl;
   
   double pre_time=currTime();
-    Dijkstra<ListGraph, int> dijkstra_test(G, s, cap);
+    Dijkstra<ListGraph, int, FibHeap<ListGraph::NodeIt, int, 
+    ListGraph::NodeMap<int> > > dijkstra_test(G, s, cap);
     dijkstra_test.run();
   double post_time=currTime();
     
-  std::cout << "running time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "running time with fib_heap: " 
+	    << post_time-pre_time << " sec"<< std::endl; 
  
-  int hiba=0;
-  EachEdgeIt e;
-  for ( G.getFirst(e) ; G.valid(e); G.next(e) ) {
-    NodeIt u=G.tail(e);
-    NodeIt v=G.head(e);
-    if ( dijkstra_test.dist(v) - dijkstra_test.dist(u) > cap.get(e) ) {
-      std::cout<<"Hiba: "<<dijkstra_test.dist(v) - dijkstra_test.dist(u) - cap.get(e)<<std::endl;
-      ++hiba;
+  pre_time=currTime();
+  Dijkstra<ListGraph, int, BinHeap<ListGraph::NodeIt, int, 
+    ListGraph::NodeMap<int> > > dijkstra_test2(G, s, cap);
+  dijkstra_test2.run();
+  post_time=currTime();
+  
+  std::cout << "running time with bin_heap: " 
+	    << post_time-pre_time << " sec"<< std::endl; 
+  
+
+  int hiba_fib=0;
+  int hiba_bin=0;
+  EachNodeIt u;
+  for ( G.getFirst(u) ; G.valid(u); G.next(u) ) {
+    InEdgeIt e;
+    for ( G.getFirst(e,u); G.valid(e); G.next(e) ) {
+      NodeIt v=G.tail(e);
+      if ( dijkstra_test.dist(u) - dijkstra_test.dist(v) > cap.get(e) )
+	{
+	  std::cout<<"Hibas el a fibonaccis Dijkstraban: " 
+		   << dijkstra_test.dist(u) - dijkstra_test.dist(v) - 
+	    cap.get(e)<<std::endl;
+	  ++hiba_fib;
+	}
+      if ( dijkstra_test2.dist(u) - dijkstra_test2.dist(v) > cap.get(e) )
+	{
+	  std::cout<<"Hibas el a binarisos Dijkstraban: " 
+		   << dijkstra_test2.dist(u) - dijkstra_test2.dist(v) - 
+	    cap.get(e)<<std::endl;
+	  ++hiba_bin;
+	}
+      if ( e==dijkstra_test.pred(u) && 
+	   dijkstra_test.dist(u) - dijkstra_test.dist(v) != cap.get(e) )
+	{
+	  std::cout<<"Hibas fael a fibonaccis Dijkstraban!"<<std::endl;
+	  ++hiba_fib;
+	}
+      if ( e==dijkstra_test2.pred(u) && 
+	   dijkstra_test2.dist(u) - dijkstra_test2.dist(v) != cap.get(e) )
+	{
+	  std::cout<<"Hibas fael a binarisos Dijkstraban!"<<std::endl;
+	  ++hiba_bin;
+	}
     }
   }
 
-  std::cout << "Hibas elek szama: " << hiba << " a " << G.edgeNum() <<"-bol."<< std::endl;
+  std::cout << "Hibas elek szama a fibonaccis Dijkstraban: " 
+	    << hiba_fib << " a " << G.edgeNum() <<"-bol."<< std::endl;
+
+  std::cout << "Hibas elek szama a binarisos Dijkstraban: " 
+	    << hiba_bin << " a " << G.edgeNum() <<"-bol."<< std::endl;
 
   return 0;
 }
diff -r 940b13aba5ff -r 9091b1ebca27 src/work/jacint/dijkstra.h
--- a/src/work/jacint/dijkstra.h	Thu Mar 11 15:57:17 2004 +0000
+++ b/src/work/jacint/dijkstra.h	Thu Mar 11 18:17:20 2004 +0000
@@ -1,4 +1,8 @@
 // -*- C++ -*-
+
+//ha predecessor az elejen nem invalid, akkor hagyd csak ugy
+//scanned mutatja hogy jo ertek van-e benne vagy szemet
+
 /* 
  *template <Graph, T, Heap=FibHeap>
  *
@@ -24,8 +28,8 @@
  *
  */
 
-#ifndef DIJKSTRA_HH
-#define DIJKSTRA_HH
+#ifndef DIJKSTRA_H
+#define DIJKSTRA_H
 
 #include <fib_heap.h>
 
diff -r 940b13aba5ff -r 9091b1ebca27 src/work/jacint/makefile
--- a/src/work/jacint/makefile	Thu Mar 11 15:57:17 2004 +0000
+++ b/src/work/jacint/makefile	Thu Mar 11 18:17:20 2004 +0000
@@ -16,6 +16,9 @@
 dijkstra: 
 	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../marci -o dijkstra dijkstra.cc
 
+prim: 
+	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../marci -o prim prim.cc
+
 clean:
 	$(RM) *.o $(BINARIES) .depend