relax4 1.0.4 → 1.0.5

data/README.rdoc

@@ -102,6 +102,13 @@ and run
 
 == HISTORY
 
+<em>1.0.5</em>
+* fix in previous version didn't quite solve the problem; new fix applied
+
+<em>1.0.4</em>
+* fixed apparent bug in ascnt2_ that caused memory corruption or infinite loop
+* switched to gemma for basic rake tasks 
+
 <em>1.0.3</em>
 * now uses RELAX4_UNCAPACITATED by default for uncapacitated problems
 * updated docs

data/ext/relax4.c

@@ -8,15 +8,15 @@
  * 1) Now using dynamic (malloc'd) rather than static arrays.
  * 2) An apparent bug in ascnt2_ has been fixed: the prdcsr array is a
  * node-length array, but it was indexed by the 'nb' variable, which can become
- * larger than the number of nodes. A new arc-length array (temp_nb) has been
- * added to avoid this.
+ * larger than the number of nodes. The prdcsr array is now as long as the max
+ * of the number of arcs and the number of nodes.
  *
  * The f2c linkage dependencies have been removed, but the FORTRAN character of
  * the code has been largely preserved -- you have been warned.
  */
 
 #include "stdlib.h"
-/*#include "stdio.h" */ /* just for tracing*/
+/* #include "stdio.h" */ /* just for tracing*/
 #include "assert.h"
 #include "relax4.h"
 
@@ -35,6 +35,7 @@ typedef char logical1;
 #define TRUE_ (1)
 #define FALSE_ (0)
 #define min(a,b) ((a) <= (b) ? (a) : (b))
+#define max(a,b) ((a) >= (b) ? (a) : (b))
 
 /* 
  * Begin translated RELAX4 code...
@@ -322,10 +323,6 @@ struct {
 
 #define cr_1 cr_
 
-/* Temporary added by JLM to avoid out-of-bounds problem caused by using the
- * prdcsr array in ascnt2_. */
-RELAX4_INT *temp_nb;
-
 /* Subroutine */ int inidat_(void)
 {
   /* System generated locals */
@@ -3670,7 +3667,7 @@ L4:
         if (arrayrc_1.rc[arc - 1] == 0) {
           *delx += arrayu_1.u[arc - 1];
           ++nb;
-          temp_nb[nb - 1] = arc; /* was blk2_3.prdcsr */
+          blk2_3.prdcsr[nb - 1] = arc; 
         }
       }
       /* L6: */
@@ -3705,7 +3702,7 @@ L4:
 
   i__1 = nb;
   for (i__ = 1; i__ <= i__1; ++i__) {
-    arc = temp_nb[i__ - 1]; /* was blk2_3.prdcsr */
+    arc = blk2_3.prdcsr[i__ - 1];
     if (blk13_1.tnxtin[arc - 1] == -1) {
       j = arraye_1.endn[arc - 1];
       blk13_1.tnxtin[arc - 1] = blk12_1.tfstin[j - 1];
@@ -3808,11 +3805,11 @@ int relax4_init(RELAX4_INT num_nodes, RELAX4_INT num_arcs,
   blk15_1.i15 = NULL;
   blk16_1.i16 = NULL;
   blk17_1.i17 = NULL;
-  temp_nb = NULL;
 
   arrayrc_1.rc   = malloc(num_arcs*sizeof(RELAX4_INT));
   blk1_1.i1      = malloc(num_nodes*sizeof(RELAX4_INT));
-  blk2_1.i2      = malloc(num_nodes*sizeof(RELAX4_INT));
+  /* fix for out-of-bounds error in ascnt2_; see comment at top of file */
+  blk2_1.i2      = malloc(max(num_nodes,num_arcs)*sizeof(RELAX4_INT));
   blk3_1.i3      = malloc(num_nodes*sizeof(RELAX4_INT));
   blk4_1.i4      = malloc(num_arcs*sizeof(RELAX4_INT));
   blk5_1.i5      = malloc(num_nodes*sizeof(RELAX4_INT));
@@ -3828,7 +3825,6 @@ int relax4_init(RELAX4_INT num_nodes, RELAX4_INT num_arcs,
   blk15_1.i15    = malloc(num_nodes*sizeof(RELAX4_INT));
   blk16_1.i16    = malloc(num_nodes*sizeof(RELAX4_INT));
   blk17_1.i17    = malloc(num_nodes*sizeof(RELAX4_INT));
-  temp_nb        = malloc(num_arcs*sizeof(RELAX4_INT));
 
   if (arrayrc_1.rc == NULL ||
       blk1_1.i1 == NULL ||
@@ -3847,8 +3843,7 @@ int relax4_init(RELAX4_INT num_nodes, RELAX4_INT num_arcs,
       blk14_1.i14 == NULL ||
       blk15_1.i15 == NULL ||
       blk16_1.i16 == NULL ||
-      blk17_1.i17 == NULL ||
-      temp_nb == NULL) {
+      blk17_1.i17 == NULL) {
     relax4_free();
     return RELAX4_FAIL_OUT_OF_MEMORY;
   }
@@ -3962,6 +3957,5 @@ void relax4_free()
   if(blk15_1.i15   ) free(blk15_1.i15   );
   if(blk16_1.i16   ) free(blk16_1.i16   );
   if(blk17_1.i17   ) free(blk17_1.i17   );
-  if(temp_nb       ) free(temp_nb       );
 }
 

data/lib/relax4/version.rb

@@ -1,3 +1,3 @@
 module Relax4
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/test/test_relax4.rb

@@ -92,6 +92,17 @@ class TestRelax4< Test::Unit::TestCase
     assert_equal 28759, problem_cost(prob, flows)
   end
 
+  def test_solve_6
+    # This problem also caused issues in the ascnt2_ routine for the same
+    # reasons as the problem in test_solve_5. The fix for that didn't entirely
+    # resolve the issue; see comments in relax4.c.
+    # This bug affected versions 1.0.4 and earlier.
+    prob = problem_from_relax4_inp 'test/test_solve_6.inp'
+    prob[:capacities].map! {|x| [x, Relax4::RELAX4_UNCAPACITATED].min}
+    flows = Relax4.solve(prob)
+    assert_equal 16925, problem_cost(prob, flows)
+  end
+
   def test_solve_lemon_1
     # Some tests stolen from LEMON version 1.2 (test/min_cost_flow_test.cc).
     # Note that we can't handle minimum flows, so we can only run tests with the

data/test/test_solve_6.inp

@@ -0,0 +1,259 @@
+17      240
+1       2       244     50000000
+1       3       738     50000000
+1       4       643     50000000
+1       5       578     50000000
+1       6       514     50000000
+1       7       433     50000000
+1       8       365     50000000
+1       9       294     50000000
+1       10      140     50000000
+1       11      79      50000000
+1       12      169     50000000
+1       13      287     50000000
+1       14      359     50000000
+1       15      207     50000000
+2       1       32      50000000
+2       3       769     50000000
+2       4       674     50000000
+2       5       609     50000000
+2       6       545     50000000
+2       7       464     50000000
+2       8       396     50000000
+2       9       325     50000000
+2       10      171     50000000
+2       11      110     50000000
+2       12      200     50000000
+2       13      318     50000000
+2       14      390     50000000
+2       15      238     50000000
+3       1       103     50000000
+3       2       72      50000000
+3       4       745     50000000
+3       5       680     50000000
+3       6       616     50000000
+3       7       535     50000000
+3       8       467     50000000
+3       9       396     50000000
+3       10      242     50000000
+3       11      181     50000000
+3       12      271     50000000
+3       13      389     50000000
+3       14      461     50000000
+3       15      309     50000000
+4       1       198     50000000
+4       2       167     50000000
+4       3       96      50000000
+4       5       775     50000000
+4       6       711     50000000
+4       7       630     50000000
+4       8       562     50000000
+4       9       491     50000000
+4       10      337     50000000
+4       11      276     50000000
+4       12      366     50000000
+4       13      484     50000000
+4       14      556     50000000
+4       15      404     50000000
+5       1       263     50000000
+5       2       232     50000000
+5       3       161     50000000
+5       4       66      50000000
+5       6       776     50000000
+5       7       695     50000000
+5       8       627     50000000
+5       9       556     50000000
+5       10      402     50000000
+5       11      341     50000000
+5       12      431     50000000
+5       13      549     50000000
+5       14      621     50000000
+5       15      469     50000000
+6       1       327     50000000
+6       2       296     50000000
+6       3       225     50000000
+6       4       130     50000000
+6       5       65      50000000
+6       7       759     50000000
+6       8       691     50000000
+6       9       620     50000000
+6       10      466     50000000
+6       11      405     50000000
+6       12      495     50000000
+6       13      613     50000000
+6       14      685     50000000
+6       15      533     50000000
+7       1       408     50000000
+7       2       377     50000000
+7       3       306     50000000
+7       4       211     50000000
+7       5       146     50000000
+7       6       82      50000000
+7       8       772     50000000
+7       9       701     50000000
+7       10      547     50000000
+7       11      486     50000000
+7       12      576     50000000
+7       13      694     50000000
+7       14      766     50000000
+7       15      614     50000000
+8       1       476     50000000
+8       2       445     50000000
+8       3       374     50000000
+8       4       279     50000000
+8       5       214     50000000
+8       6       150     50000000
+8       7       69      50000000
+8       9       769     50000000
+8       10      615     50000000
+8       11      554     50000000
+8       12      644     50000000
+8       13      762     50000000
+8       14      834     50000000
+8       15      682     50000000
+9       1       547     50000000
+9       2       516     50000000
+9       3       445     50000000
+9       4       350     50000000
+9       5       285     50000000
+9       6       221     50000000
+9       7       140     50000000
+9       8       72      50000000
+9       10      686     50000000
+9       11      625     50000000
+9       12      715     50000000
+9       13      833     50000000
+9       14      905     50000000
+9       15      753     50000000
+10      1       136     50000000
+10      2       105     50000000
+10      3       599     50000000
+10      4       504     50000000
+10      5       439     50000000
+10      6       375     50000000
+10      7       294     50000000
+10      8       226     50000000
+10      9       155     50000000
+10      11      214     50000000
+10      12      304     50000000
+10      13      422     50000000
+10      14      494     50000000
+10      15      342     50000000
+11      1       231     50000000
+11      2       200     50000000
+11      3       968     50000000
+11      4       873     50000000
+11      5       808     50000000
+11      6       744     50000000
+11      7       663     50000000
+11      8       595     50000000
+11      9       524     50000000
+11      10      370     50000000
+11      12      91      50000000
+11      13      209     50000000
+11      14      281     50000000
+11      15      129     50000000
+12      1       388     50000000
+12      2       357     50000000
+12      3       1125    50000000
+12      4       1030    50000000
+12      5       965     50000000
+12      6       901     50000000
+12      7       820     50000000
+12      8       752     50000000
+12      9       681     50000000
+12      10      527     50000000
+12      11      466     50000000
+12      13      119     50000000
+12      14      191     50000000
+12      15      286     50000000
+13      1       270     50000000
+13      2       239     50000000
+13      3       1007    50000000
+13      4       912     50000000
+13      5       847     50000000
+13      6       783     50000000
+13      7       702     50000000
+13      8       634     50000000
+13      9       563     50000000
+13      10      409     50000000
+13      11      348     50000000
+13      12      438     50000000
+13      14      73      50000000
+13      15      168     50000000
+14      1       198     50000000
+14      2       167     50000000
+14      3       935     50000000
+14      4       840     50000000
+14      5       775     50000000
+14      6       711     50000000
+14      7       630     50000000
+14      8       562     50000000
+14      9       491     50000000
+14      10      337     50000000
+14      11      276     50000000
+14      12      366     50000000
+14      13      484     50000000
+14      15      96      50000000
+15      1       103     50000000
+15      2       72      50000000
+15      3       840     50000000
+15      4       745     50000000
+15      5       680     50000000
+15      6       616     50000000
+15      7       535     50000000
+15      8       467     50000000
+15      9       396     50000000
+15      10      242     50000000
+15      11      181     50000000
+15      12      271     50000000
+15      13      389     50000000
+15      14      461     50000000
+16      1       0       50000000
+16      2       0       50000000
+16      3       0       50000000
+16      4       0       50000000
+16      5       0       50000000
+16      6       0       50000000
+16      7       0       50000000
+16      8       0       50000000
+16      9       0       50000000
+16      10      0       50000000
+16      11      0       50000000
+16      12      0       50000000
+16      13      0       50000000
+16      14      0       50000000
+16      15      0       50000000
+1       17      0       50000000
+2       17      0       50000000
+3       17      0       50000000
+4       17      0       50000000
+5       17      0       50000000
+6       17      0       50000000
+7       17      0       50000000
+8       17      0       50000000
+9       17      0       50000000
+10      17      0       50000000
+11      17      0       50000000
+12      17      0       50000000
+13      17      0       50000000
+14      17      0       50000000
+15      17      0       50000000
+5
+11
+-6
+-5
+-6
+1
+-1
+-5
+-5
+-2
+1
+13
+8
+2
+8
+0
+-19
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relax4
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - John Lees-Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +01:00
+date: 2010-09-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -33,14 +33,15 @@ extra_rdoc_files:
 files: 
 - lib/relax4.rb
 - lib/relax4/version.rb
+- test/test_solve_6.inp
+- test/test_solve_5.inp
+- test/test_solve_4.inp
+- test/RELAX4.INP
 - ext/extconf.rb
 - ext/relax4.c
 - ext/relax4.h
 - ext/relax4_wrap.c
 - README.rdoc
-- test/RELAX4.INP
-- test/test_solve_4.inp
-- test/test_solve_5.inp
 - test/test_relax4.rb
 has_rdoc: true
 homepage: http://relax4.rubyforge.org/
@@ -50,6 +51,10 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
+- --title
+- relax4-1.0.5
+- --exclude
+- ext
 require_paths: 
 - lib
 - ext