[lmi-commits] [lmi] master e220da9 1/7: Correct some unit-test expectations

[Greg Chicares]

branch: master
commit e220da9f98b037b1311614c12aadcdf01a78120a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Correct some unit-test expectations
    
    Fixed incorrect expected canonical form ('g') for several unit tests.
    Intervals that extend for a given number of years really should have
    their right-hand endpoints marked with '#', for reasons that will be
    explained in detail in an upcoming commit that will add a new function
    returning a sequence in canonical form. Also fixed one 'g' that lacked
    a ')' at its end.
---
 input_sequence_test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/input_sequence_test.cpp b/input_sequence_test.cpp
index 387f6e7..733acc4 100644
--- a/input_sequence_test.cpp
+++ b/input_sequence_test.cpp
@@ -211,7 +211,7 @@ int test_main(int, char*[])
     double const d[n] = {1, 1, 1, 3, 3, 3, 5, 5, 5, 7};
     std::string const e("1 #3; 3 #3; 5 #3; 7");
     census += e + "\t\t\t\n";
-    std::string const g("1 [0, 3); 3 [3, 6); 5 [6, 9); 7 [9, maturity)");
+    std::string const g("1 [0, #3); 3 [3, #3); 5 [6, #3); 7 [9, maturity)");
     check(__FILE__, __LINE__, n, d, e, g);
     }
 
@@ -244,7 +244,7 @@ int test_main(int, char*[])
     double const d[n] = {1, 1, 1, 1, 2, 3, 4, 5, 5};
     std::string const e("1 [0, 4); 2 5; 3 #1; 4 @97; 5");
     census += e + "\t\t\t\n";
-    std::string const g("1 [0, 4); 2 [4, 5); 3 [5, 6); 4 [6, @97); 5 
address@hidden, maturity)");
+    std::string const g("1 [0, 4); 2 [4, 5); 3 [5, #1); 4 [6, @97); 5 
address@hidden, maturity)");
     check(__FILE__, __LINE__, n, d, e, g);
     }
 
@@ -354,7 +354,7 @@ int test_main(int, char*[])
     double const d[n] = {0, 12, 0, 27, 0, 1, 7, 7, 7, 7};
     std::string const e("12 [1, @92); 27 address@hidden, @93]; 1 (@94, #1]; 
7");
     census += e + "\t\t! not a partition\t\n";
-    std::string const g("0 [0, 1); 12 [1, @92); 0 address@hidden, @93); 27 
address@hidden, @94); 0 address@hidden, @95); 1 address@hidden, @96); 7 
address@hidden, maturity");
+    std::string const g("0 [0, 1); 12 [1, @92); 0 address@hidden, @93); 27 
address@hidden, @94); 0 address@hidden, @95); 1 address@hidden, #1); 7 
address@hidden, maturity)");
     check(__FILE__, __LINE__, n, d, e, g);
     }
 
@@ -366,7 +366,7 @@ int test_main(int, char*[])
     double const d[n] = {0, 12.25, 0, 27.875, 0, 1.0625, 7.5, 7.5, 7.5, 7.5};
     std::string const e("12.25 [1,@92); 27.875 address@hidden,@93]; 
1.0625(@94,#1]; 7.5");
     census += e + "\t\t! not a partition\t\n";
-    std::string const g("0 [0, 1); 12.25 [1, @92); 0 address@hidden, @93); 
27.875 address@hidden, @94); 0 address@hidden, @95); 1.0625 address@hidden, 
@96); 7.5 address@hidden, maturity)");
+    std::string const g("0 [0, 1); 12.25 [1, @92); 0 address@hidden, @93); 
27.875 address@hidden, @94); 0 address@hidden, @95); 1.0625 address@hidden, 
#1); 7.5 address@hidden, maturity)");
     check(__FILE__, __LINE__, n, d, e, g);
     }