Changeset 292:e7af73f1805e in lemon
 Timestamp:
 10/01/08 12:26:45 (16 years ago)
 Branch:
 default
 Parents:
 291:d901321d6555 (diff), 289:d91884dcd572 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.  Phase:
 public
 Location:
 lemon
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

lemon/bfs.h
r288 r292 136 136 class Bfs { 137 137 public: 138 ///\ref Exception for uninitialized parameters.139 140 ///This error represents problems in the initialization of the141 ///parameters of the algorithm.142 class UninitializedParameter : public lemon::UninitializedParameter {143 public:144 virtual const char* what() const throw() {145 return "lemon::Bfs::UninitializedParameter";146 }147 };148 138 149 139 ///The type of the digraph the algorithm runs on. … … 233 223 static PredMap *createPredMap(const Digraph &) 234 224 { 235 throw UninitializedParameter(); 225 LEMON_ASSERT(false, "PredMap is not initialized"); 226 return 0; // ignore warnings 236 227 } 237 228 }; … … 251 242 static DistMap *createDistMap(const Digraph &) 252 243 { 253 throw UninitializedParameter(); 244 LEMON_ASSERT(false, "DistMap is not initialized"); 245 return 0; // ignore warnings 254 246 } 255 247 }; … … 269 261 static ReachedMap *createReachedMap(const Digraph &) 270 262 { 271 throw UninitializedParameter(); 263 LEMON_ASSERT(false, "ReachedMap is not initialized"); 264 return 0; // ignore warnings 272 265 } 273 266 }; … … 287 280 static ProcessedMap *createProcessedMap(const Digraph &) 288 281 { 289 throw UninitializedParameter(); 282 LEMON_ASSERT(false, "ProcessedMap is not initialized"); 283 return 0; // ignore warnings 290 284 } 291 285 }; … … 305 299 { 306 300 return new ProcessedMap(g); 301 return 0; // ignore warnings 307 302 } 308 303 }; … … 1041 1036 bool run(Node s, Node t) 1042 1037 { 1043 if (s==INVALID  t==INVALID) throw UninitializedParameter();1044 1038 Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g)); 1045 1039 if (Base::_pred) … … 1324 1318 public: 1325 1319 1326 /// \brief \ref Exception for uninitialized parameters.1327 ///1328 /// This error represents problems in the initialization1329 /// of the parameters of the algorithm.1330 class UninitializedParameter : public lemon::UninitializedParameter {1331 public:1332 virtual const char* what() const throw()1333 {1334 return "lemon::BfsVisit::UninitializedParameter";1335 }1336 };1337 1338 1320 ///The traits class. 1339 1321 typedef _Traits Traits; … … 1390 1372 typedef T ReachedMap; 1391 1373 static ReachedMap *createReachedMap(const Digraph &digraph) { 1392 throw UninitializedParameter(); 1374 LEMON_ASSERT(false, "ReachedMap is not initialized"); 1375 return 0; // ignore warnings 1393 1376 } 1394 1377 }; 
lemon/bfs.h
r290 r292 1313 1313 template <typename _Digraph = ListDigraph, 1314 1314 typename _Visitor = BfsVisitor<_Digraph>, 1315 typename _Traits = Bfs DefaultTraits<_Digraph> >1315 typename _Traits = BfsVisitDefaultTraits<_Digraph> > 1316 1316 #endif 1317 1317 class BfsVisit { 
lemon/dfs.h
r288 r292 137 137 class Dfs { 138 138 public: 139 ///\ref Exception for uninitialized parameters.140 141 ///This error represents problems in the initialization of the142 ///parameters of the algorithm.143 class UninitializedParameter : public lemon::UninitializedParameter {144 public:145 virtual const char* what() const throw() {146 return "lemon::Dfs::UninitializedParameter";147 }148 };149 139 150 140 ///The type of the digraph the algorithm runs on. … … 233 223 static PredMap *createPredMap(const Digraph &) 234 224 { 235 throw UninitializedParameter(); 225 LEMON_ASSERT(false, "PredMap is not initialized"); 226 return 0; // ignore warnings 236 227 } 237 228 }; … … 251 242 static DistMap *createDistMap(const Digraph &) 252 243 { 253 throw UninitializedParameter(); 244 LEMON_ASSERT(false, "DistMap is not initialized"); 245 return 0; // ignore warnings 254 246 } 255 247 }; … … 269 261 static ReachedMap *createReachedMap(const Digraph &) 270 262 { 271 throw UninitializedParameter(); 263 LEMON_ASSERT(false, "ReachedMap is not initialized"); 264 return 0; // ignore warnings 272 265 } 273 266 }; … … 287 280 static ProcessedMap *createProcessedMap(const Digraph &) 288 281 { 289 throw UninitializedParameter(); 282 LEMON_ASSERT(false, "ProcessedMap is not initialized"); 283 return 0; // ignore warnings 290 284 } 291 285 }; … … 975 969 bool run(Node s, Node t) 976 970 { 977 if (s==INVALID  t==INVALID) throw UninitializedParameter();978 971 Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g)); 979 972 if (Base::_pred) … … 1271 1264 public: 1272 1265 1273 /// \brief \ref Exception for uninitialized parameters.1274 ///1275 /// This error represents problems in the initialization1276 /// of the parameters of the algorithm.1277 class UninitializedParameter : public lemon::UninitializedParameter {1278 public:1279 virtual const char* what() const throw()1280 {1281 return "lemon::DfsVisit::UninitializedParameter";1282 }1283 };1284 1285 1266 ///The traits class. 1286 1267 typedef _Traits Traits; … … 1337 1318 typedef T ReachedMap; 1338 1319 static ReachedMap *createReachedMap(const Digraph &digraph) { 1339 throw UninitializedParameter(); 1320 LEMON_ASSERT(false, "ReachedMap is not initialized"); 1321 return 0; // ignore warnings 1340 1322 } 1341 1323 }; 
lemon/dfs.h
r290 r292 1259 1259 template <typename _Digraph = ListDigraph, 1260 1260 typename _Visitor = DfsVisitor<_Digraph>, 1261 typename _Traits = Dfs DefaultTraits<_Digraph> >1261 typename _Traits = DfsVisitDefaultTraits<_Digraph> > 1262 1262 #endif 1263 1263 class DfsVisit {
Note: See TracChangeset
for help on using the changeset viewer.