updated readme for this being the new master branch, CAD paper

Author: samitch

IntervalAssignment-xcode/IntervalAssignment-xcode.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		D243C81923EE47F000F3C7BF /* IAResultImplementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D243C81723EE47EF00F3C7BF /* IAResultImplementation.cpp */; };
 		D243C81B23F5FEB700F3C7BF /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D243C81A23F5FEB600F3C7BF /* test.cpp */; };
 		D2B6599123FCEA29009EBEAE /* IAQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2B6599023FCEA29009EBEAE /* IAQueue.cpp */; };
-		D2E0AD7A2600779E00141301 /* iia-cubit-autotest-alltests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2E0AD792600779E00141301 /* iia-cubit-autotest-alltests.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -44,7 +43,6 @@
 		D243C81A23F5FEB600F3C7BF /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../Source/test.cpp; sourceTree = SOURCE_ROOT; };
 		D2B6598F23FCE916009EBEAE /* IAQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAQueue.h; path = ../Source/IAQueue.h; sourceTree = "<group>"; };
 		D2B6599023FCEA29009EBEAE /* IAQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IAQueue.cpp; path = /Users/samitch/Documents/repos/IntervalAssignment/Source/IAQueue.cpp; sourceTree = "<absolute>"; };
-		D2E0AD792600779E00141301 /* iia-cubit-autotest-alltests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "iia-cubit-autotest-alltests.cpp"; path = "../../Source/iia-cubit-autotest-alltests.cpp"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -77,7 +75,6 @@
 		D243C7FD23EB929800F3C7BF /* IntervalAssignment-xcode */ = {
 			isa = PBXGroup;
 			children = (
-				D2E0AD792600779E00141301 /* iia-cubit-autotest-alltests.cpp */,
 				D2B6599023FCEA29009EBEAE /* IAQueue.cpp */,
 				D2B6598F23FCE916009EBEAE /* IAQueue.h */,
 				D243C81723EE47EF00F3C7BF /* IAResultImplementation.cpp */,
@@ -158,7 +155,6 @@
 				D243C81923EE47F000F3C7BF /* IAResultImplementation.cpp in Sources */,
 				D243C81B23F5FEB700F3C7BF /* test.cpp in Sources */,
 				D2B6599123FCEA29009EBEAE /* IAQueue.cpp in Sources */,
-				D2E0AD7A2600779E00141301 /* iia-cubit-autotest-alltests.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

README.md

@@ -43,6 +43,18 @@ IIA is C++11 and has *no* dependencies.
 IA.h is the interface.
 The driver code test.cpp gives examples of setting up and solving the problem.
 
+== Versions / Branches
+
+master 
+branch contains the version for the 2022-2023 CAD Journal [IIA-journal]
+this is the version with the best output and runtime
+
+imr2021
+branch contains the version at the time the 2021 IMR [IIA] paper was written.
+
+The Test directory and Source/test.cpp are not needed for using the code as a library.
+
+To run the tests mentioned in these papers, modify test.cpp to include one or more of the cpp files in the Test directory.
 
 == Acknowledgements
 
@@ -54,7 +66,7 @@ The predecessors to this code include BBIA, a linear-programming plus branch-and
 == Bibliography
 
 [BBIA]
-  "High Fidelity Interval Assignment," Scott A. Mitchell, Proc. 6th International Meshing Roundtable `97, 33-44 (1997), and
+  "High Fidelity Interval Assignment," Scott A. Mitchell, Proc. 6th International Meshing Roundtable, 33-44 (1997), and
 International Journal of Computational Geometry and Applications, Vol. 10, No. 4 (2000) 399-415.
 
 [NLIA] 
@@ -67,7 +79,14 @@ International Journal of Computational Geometry and Applications, Vol. 10, No. 4
   "Incremental Interval Assignment (IIA) for Scalable Mesh Preparation," Scott A. Mitchell, Sandia National Laboratories technical report SAND2019-11163R, LDRD 19-1050, 2019.
 
 [IIA]
-  "Interval Assignment by Integer Linear Algebra," Scott A. Mitchell, in preparation.
+  "Incremental Interval Assignment by Integer Linear Algebra,"
+  Scott A. Mitchell, International Meshing Roundtable,
+  2021, volume 29, pages 18.
+
+[IIA-journal]
+  "Interval Assignment by Integer Linear Algebra with Improvements," 
+  Scott A. Mitchell, Computer Aided Design, 
+  in preparation.
 
 
 == IIA Design Background 

Source/IncrementalIntervalAssignment.cpp

@@ -2229,7 +2229,7 @@ namespace IIA_Internal
               for (auto r : tc_rows)
               {
                 const auto r_val = MN.rows[r].get_val(t.c);
-                const auto r_sign = (r_val > 0 ? 1 : -1) * t.dx; // sign after row is negated if needed to get sign == dx.
+                // const auto r_sign = (r_val > 0 ? 1 : -1) * t.dx; // sign after row is negated if needed to get sign == dx.
 
                 if (smallest_self_block_coeff <= abs(r_val))
                 {
@@ -2257,7 +2257,7 @@ namespace IIA_Internal
                 }
 
                 bool try_row = true;
-                bool progress = false;
+                // bool progress = false;
                 for (auto &blocking_col : blocking_cols)
                 {
 
@@ -6559,7 +6559,7 @@ namespace IIA_Internal
     result->debug_message("Solving IIA mapping subproblems.\n");
 
     bool success = solve_phase(true, do_improve, new_row_min, new_row_max);
-    if (0)
+      if (/* DISABLES CODE */ (0))
     {
       print_solution_summary("solution after mapping phase");
     }
@@ -7001,7 +7001,7 @@ namespace IIA_Internal
     }
 
     // hack for test_problem_augmented_nullspace_demo zzyk
-    if (0 && !map_only_phase)
+      if (/* DISABLES CODE */ (0) && !map_only_phase)
     {
       col_solution[0]=4;
       col_solution[1]=4;
@@ -8151,7 +8151,7 @@ namespace IIA_Internal
     }
 
     // all off
-    if (0)
+    if (/* DISABLES CODE */ (0))
     {
       use_HNF_always = false; // false then try rref solution first
       use_HNF_goals = false;  // false c=1

Source/test.cpp

@@ -5,7 +5,7 @@
 #include "CpuTimer.h"
 #include <iostream>
 
-#include "iia-cubit-autotest-scale-cren.h"
+// #include "iia-cubit-autotest-scale-cren.h"
 // #include "iia-cubit-autotest-alltests.cpp"
 // #include "iia-cubit-autotest-alltests-rebase-19march2020.cpp"
 // #include "iia-cubit-autotest-onetest.cpp"
@@ -1504,7 +1504,7 @@ int main(int argc, const char * argv[])
 
   // test_problem_augmented_nullspace_demo(); return 0;
 
-  iia_cubit_autotest(); return 0;
+  // iia_cubit_autotest(); return 0;
 
   // tests where use_map_nullspace might make a difference
   // test_problem_C();