Changeset 290:f6899946c1ac in lemon for lemon/dijkstra.h

Timestamp:

09/30/08 20:53:18 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Simplifying exceptions

• Using asserts instead of exceptions for unitialized parameters
• Only the IO exceptions are used in the lemon
• DataFormatError? is renamed to FormatError?
• The IoError? is used for file access errors

File:

• lemon/dijkstra.h (modified) (7 diffs)

lemon/dijkstra.h

@@ -226 +226 @@
   class Dijkstra {
   public:
-    ///\ref Exception for uninitialized parameters.
-
-    ///This error represents problems in the initialization of the
-    ///parameters of the algorithm.
-    class UninitializedParameter : public lemon::UninitializedParameter {
-    public:
-      virtual const char* what() const throw() {
-        return "lemon::Dijkstra::UninitializedParameter";
-      }
-    };
 
     ///The type of the digraph the algorithm runs on.
@@ -333 +323 @@
       static PredMap *createPredMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        LEMON_ASSERT(false, "PredMap is not initialized");
+        return 0; // ignore warnings
       }
     };
@@ -352 +343 @@
       static DistMap *createDistMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        LEMON_ASSERT(false, "DistMap is not initialized");
+        return 0; // ignore warnings
       }
     };
@@ -371 +363 @@
       static ProcessedMap *createProcessedMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        LEMON_ASSERT(false, "ProcessedMap is not initialized");
+        return 0; // ignore warnings
       }
     };
@@ -409 +402 @@
       typedef H Heap;
       static HeapCrossRef *createHeapCrossRef(const Digraph &) {
-        throw UninitializedParameter();
+        LEMON_ASSERT(false, "HeapCrossRef is not initialized");
+        return 0; // ignore warnings
       }
       static Heap *createHeap(HeapCrossRef &)
       {
-        throw UninitializedParameter();
+        LEMON_ASSERT(false, "Heap is not initialized");
+        return 0; // ignore warnings
       }
     };
@@ -1159 +1154 @@
     void run(Node s)
     {
-      if (s==INVALID) throw UninitializedParameter();
       Dijkstra<Digraph,LengthMap,TR>
         dijk(*reinterpret_cast<const Digraph*>(Base::_g),
@@ -1181 +1175 @@
     bool run(Node s, Node t)
     {
-      if (s==INVALID || t==INVALID) throw UninitializedParameter();
       Dijkstra<Digraph,LengthMap,TR>
         dijk(*reinterpret_cast<const Digraph*>(Base::_g),