Changes in / [1286:76284e152f69:1285:6c8e2d8712d8] in lemon
- Files:
-
- 1 deleted
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
NEWS
r1277 r962 1 2013-08-10 Version 1.2.4 released2 3 Bugfix release.4 5 #432: Add missing doc/template.h and doc/references.bib to release6 tarball7 #433: Support shared library build8 ----: Update CPLEX lookup9 ----: Make CBC interface compatible with latest CBC releases10 ----: Intel C++ compatibility fixes11 #441: Fix buggy reinitialization in _solver_bits::VarIndex::clear()12 #444: Bugfix in path copy constructors and assignment operators13 #447: Bugfix in AllArcLookUp<>14 #448: Bugfix in adaptor_test.cc15 #449: Fix clang compilation warnings and errors16 #440: Fix a bug + remove redundant typedefs in dimacs-solver17 #453: Avoid GCC 4.7 compiler warnings18 #445: Fix missing initialization in CplexEnv::CplexEnv()19 #461: Bugfix in assert.h20 #470: Fix compilation issues related to various gcc versions21 #439: Bugfix in biNodeConnected()22 #469: Bugfix in test/maps_test.cc23 24 2011-11-09 Version 1.2.3 released25 26 Bugfix release.27 28 #428: Add missing lemon/lemon.pc.cmake to the release tarball29 #429: Fix VS warnings30 #430: Fix LpBase::Constr two-side limit bug31 32 2011-08-08 Version 1.2.2 released33 34 Bugfix release.35 36 #392: Bug fix in Dfs::start(s,t)37 #414: Fix wrong initialization in Preflow38 #404: Update Doxygen configuration39 #416: Support tests with valgrind40 #418: Better Win CodeBlock/MinGW support41 #419: Backport build environment improvements from the main branch42 - Build of mip_test and lp_test precede the running of the tests43 - Also search for coin libs under ${COIN_ROOT_DIR}/lib/coin44 - Do not look for COIN_VOL libraries45 #382: Allow lgf file without Arc maps46 #417: Bug fix in CostScaling47 48 2010-10-21 Version 1.2.1 released49 50 Bugfix release.51 52 #366: Fix Pred[Matrix]MapPath::empty()53 #371: Bug fix in (di)graphCopy()54 The target graph is cleared before adding nodes and arcs/edges.55 56 #364: Add missing UndirectedTags57 #368: Fix the usage of std::numeric_limits<>::min() in Network Simplex58 #372: Fix a critical bug in preflow59 60 1 2010-03-19 Version 1.2 released 61 2 -
configure.ac
r1276 r1039 19 19 AC_CONFIG_AUX_DIR([build-aux]) 20 20 AC_CONFIG_MACRO_DIR([m4]) 21 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects nostdinc])21 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc]) 22 22 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 23 23 AC_CONFIG_HEADERS([config.h lemon/config.h]) -
doc/groups.dox
r963 r959 287 287 288 288 /** 289 @defgroup matrices Matrices 290 @ingroup auxdat 291 \brief Two dimensional data storages implemented in LEMON. 292 293 This group contains two dimensional data storages implemented in LEMON. 294 */ 295 296 /** 289 297 @defgroup algs Algorithms 290 298 \brief This group contains the several algorithms … … 319 327 but the digraph should not contain directed cycles with negative total 320 328 length. 329 - \ref FloydWarshall "Floyd-Warshall" and \ref Johnson "Johnson" algorithms 330 for solving the \e all-pairs \e shortest \e paths \e problem when arc 331 lenghts can be either positive or negative, but the digraph should 332 not contain directed cycles with negative total length. 321 333 - \ref Suurballe A successive shortest path algorithm for finding 322 334 arc-disjoint paths between two nodes having minimum total length. … … 352 364 \f[ 0 \leq f(uv) \leq cap(uv) \quad \forall uv\in A \f] 353 365 354 \ref Preflow is an efficient implementation of Goldberg-Tarjan's 355 preflow push-relabel algorithm \ref goldberg88newapproach for finding 356 maximum flows. It also provides functions to query the minimum cut, 357 which is the dual problem of maximum flow. 366 LEMON contains several algorithms for solving maximum flow problems: 367 - \ref EdmondsKarp Edmonds-Karp algorithm 368 \ref edmondskarp72theoretical. 369 - \ref Preflow Goldberg-Tarjan's preflow push-relabel algorithm 370 \ref goldberg88newapproach. 371 - \ref DinitzSleatorTarjan Dinitz's blocking flow algorithm with dynamic trees 372 \ref dinic70algorithm, \ref sleator83dynamic. 373 - \ref GoldbergTarjan !Preflow push-relabel algorithm with dynamic trees 374 \ref goldberg88newapproach, \ref sleator83dynamic. 375 376 In most cases the \ref Preflow algorithm provides the 377 fastest method for computing a maximum flow. All implementations 378 also provide functions to query the minimum cut, which is the dual 379 problem of maximum flow. 358 380 359 381 \ref Circulation is a preflow push-relabel algorithm implemented directly … … 412 434 - \ref HaoOrlin "Hao-Orlin algorithm" for calculating minimum cut 413 435 in directed graphs. 436 - \ref NagamochiIbaraki "Nagamochi-Ibaraki algorithm" for 437 calculating minimum cut in undirected graphs. 414 438 - \ref GomoryHu "Gomory-Hu tree computation" for calculating 415 439 all-pairs minimum cut in undirected graphs. … … 474 498 475 499 The matching algorithms implemented in LEMON: 500 - \ref MaxBipartiteMatching Hopcroft-Karp augmenting path algorithm 501 for calculating maximum cardinality matching in bipartite graphs. 502 - \ref PrBipartiteMatching Push-relabel algorithm 503 for calculating maximum cardinality matching in bipartite graphs. 504 - \ref MaxWeightedBipartiteMatching 505 Successive shortest path algorithm for calculating maximum weighted 506 matching and maximum weighted bipartite matching in bipartite graphs. 507 - \ref MinCostMaxBipartiteMatching 508 Successive shortest path algorithm for calculating minimum cost maximum 509 matching in bipartite graphs. 476 510 - \ref MaxMatching Edmond's blossom shrinking algorithm for calculating 477 511 maximum cardinality matching in general graphs. … … 518 552 519 553 /** 554 @defgroup approx Approximation Algorithms 555 @ingroup algs 556 \brief Approximation algorithms. 557 558 This group contains the approximation and heuristic algorithms 559 implemented in LEMON. 560 */ 561 562 /** 520 563 @defgroup auxalg Auxiliary Algorithms 521 564 @ingroup algs … … 546 589 The currently supported solvers are \ref glpk, \ref clp, \ref cbc, 547 590 \ref cplex, \ref soplex. 591 */ 592 593 /** 594 @defgroup lp_utils Tools for Lp and Mip Solvers 595 @ingroup lp_group 596 \brief Helper tools to the Lp and Mip solvers. 597 598 This group adds some helper tools to general optimization framework 599 implemented in LEMON. 600 */ 601 602 /** 603 @defgroup metah Metaheuristics 604 @ingroup gen_opt_group 605 \brief Metaheuristics for LEMON library. 606 607 This group contains some metaheuristic optimization tools. 548 608 */ 549 609 -
doc/lgf.dox
r1081 r1069 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/bits/graph_adaptor_extender.h
r1081 r965 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/bits/path_dump.h
r1081 r973 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/bits/windows.cc
r1084 r1055 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/cost_scaling.h
r1084 r1041 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/lp_base.h
r1161 r1143 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/maps.h
r1084 r1057 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/preflow.h
r1110 r1107 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 555 555 } 556 556 } 557 for (NodeIt n(_graph); n != INVALID; ++n) 557 for (NodeIt n(_graph); n != INVALID; ++n) 558 558 if(n!=_source && n!=_target && _tolerance.positive((*_excess)[n])) 559 559 _level->activate(n); 560 560 561 561 return true; 562 562 } … … 586 586 level = _level->highestActiveLevel(); 587 587 --num; 588 588 589 589 Value excess = (*_excess)[n]; 590 590 int new_level = _level->maxLevel(); -
test/Makefile.am
r1110 r1107 79 79 test_graph_test_SOURCES = test/graph_test.cc 80 80 test_graph_utils_test_SOURCES = test/graph_utils_test.cc 81 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc82 81 test_heap_test_SOURCES = test/heap_test.cc 83 82 test_kruskal_test_SOURCES = test/kruskal_test.cc 83 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc 84 84 test_lgf_test_SOURCES = test/lgf_test.cc 85 85 test_lp_test_SOURCES = test/lp_test.cc -
test/dfs_test.cc
r1263 r1259 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 224 224 check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6."); 225 225 } 226 226 227 227 { 228 228 NullMap<Node,Arc> myPredMap; -
test/graph_copy_test.cc
r1081 r984 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 71 71 nodeCrossRef(ncr).arcCrossRef(ecr). 72 72 node(fn, tn).arc(fa, ta).run(); 73 73 74 74 check(countNodes(from) == countNodes(to), "Wrong copy."); 75 75 check(countArcs(from) == countArcs(to), "Wrong copy."); … … 99 99 // Test repeated copy 100 100 digraphCopy(from, to).run(); 101 101 102 102 check(countNodes(from) == countNodes(to), "Wrong copy."); 103 103 check(countArcs(from) == countArcs(to), "Wrong copy."); … … 201 201 // Test repeated copy 202 202 graphCopy(from, to).run(); 203 203 204 204 check(countNodes(from) == countNodes(to), "Wrong copy."); 205 205 check(countEdges(from) == countEdges(to), "Wrong copy."); -
test/heap_test.cc
r1084 r1065 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
test/lgf_test.cc
r1097 r1087 64 64 65 65 66 int main() 66 int main() 67 67 { 68 68 { 69 ListDigraph d; 69 ListDigraph d; 70 70 ListDigraph::Node s,t; 71 71 ListDigraph::ArcMap<int> label(d); … … 94 94 95 95 { 96 ListDigraph d; 96 ListDigraph d; 97 97 std::istringstream input(test_lgf_nomap); 98 98 digraphReader(d, input). … … 111 111 112 112 { 113 ListDigraph d; 113 ListDigraph d; 114 114 std::istringstream input(test_lgf_bad1); 115 115 bool ok=false; … … 118 118 run(); 119 119 } 120 catch (FormatError&) 120 catch (FormatError&) 121 121 { 122 122 ok = true; … … 140 140 141 141 { 142 ListDigraph d; 142 ListDigraph d; 143 143 std::istringstream input(test_lgf_bad2); 144 144 bool ok=false; -
test/lp_test.cc
r1248 r1247 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-20 115 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
test/maps_test.cc
r1277 r1259 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 536 536 537 537 typedef Orienter<Graph, const ConstMap<Edge, bool> > Digraph; 538 ConstMap<Edge, bool> true_edge_map(true); 539 Digraph dgr(gr, true_edge_map); 538 Digraph dgr(gr, constMap<Edge, bool>(true)); 540 539 OutDegMap<Digraph> odm(dgr); 541 540 InDegMap<Digraph> idm(dgr); -
test/preflow_test.cc
r1263 r1259 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-201 15 * Copyright (C) 2003-2010 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). … … 161 161 { 162 162 DIGRAPH_TYPEDEFS(SmartDigraph); 163 163 164 164 SmartDigraph g; 165 165 SmartDigraph::ArcMap<int> cap(g),iflow(g); … … 273 273 274 274 initFlowTest(); 275 275 276 276 return 0; 277 277 }
Note: See TracChangeset
for help on using the changeset viewer.