gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge bugfix #368 to branch 1.2
0 1 0
merge 1.2
1 file changed with 2 insertions and 2 deletions:
↑ Collapse diff ↑
Ignore white space 12 line context
... ...
@@ -1074,13 +1074,13 @@
1074 1074

	
1075 1075
      // Initialize artifical cost
1076 1076
      Cost ART_COST;
1077 1077
      if (std::numeric_limits<Cost>::is_exact) {
1078 1078
        ART_COST = std::numeric_limits<Cost>::max() / 2 + 1;
1079 1079
      } else {
1080
        ART_COST = std::numeric_limits<Cost>::min();
1080
        ART_COST = 0;
1081 1081
        for (int i = 0; i != _arc_num; ++i) {
1082 1082
          if (_cost[i] > ART_COST) ART_COST = _cost[i];
1083 1083
        }
1084 1084
        ART_COST = (ART_COST + 1) * _node_num;
1085 1085
      }
1086 1086

	
... ...
@@ -1586,13 +1586,13 @@
1586 1586
      }
1587 1587

	
1588 1588
      // Shift potentials to meet the requirements of the GEQ/LEQ type
1589 1589
      // optimality conditions
1590 1590
      if (_sum_supply == 0) {
1591 1591
        if (_stype == GEQ) {
1592
          Cost max_pot = std::numeric_limits<Cost>::min();
1592
          Cost max_pot = -std::numeric_limits<Cost>::max();
1593 1593
          for (int i = 0; i != _node_num; ++i) {
1594 1594
            if (_pi[i] > max_pot) max_pot = _pi[i];
1595 1595
          }
1596 1596
          if (max_pot > 0) {
1597 1597
            for (int i = 0; i != _node_num; ++i)
1598 1598
              _pi[i] -= max_pot;
0 comments (0 inline)