Merge pull request #1338 from stan-dev/tests/broaden-optimize-output-test

Optimize tests: don't assume number of algorithmic parameters in output

Author: WardBrian

src/test/interface/optimization_output_test.cpp

@@ -59,10 +59,12 @@ TEST_F(CmdStan, optimize_default) {
   EXPECT_TRUE(boost::contains(config[jacobian_idx], "= false (Default)"));
 
   ASSERT_NEAR(0, values[0], 0.00001);
-  EXPECT_FLOAT_EQ(1, values[1]);
-  EXPECT_FLOAT_EQ(100, values[2]);
-  EXPECT_FLOAT_EQ(10000, values[3]);
-  EXPECT_FLOAT_EQ(1000000, values[4]);
+  auto outputs = values.size();
+
+  EXPECT_FLOAT_EQ(1, values[outputs - 4]);
+  EXPECT_FLOAT_EQ(100, values[outputs - 3]);
+  EXPECT_FLOAT_EQ(10000, values[outputs - 2]);
+  EXPECT_FLOAT_EQ(1000000, values[outputs - 1]);
 }
 
 TEST_F(CmdStan, optimize_bfgs) {
@@ -85,10 +87,12 @@ TEST_F(CmdStan, optimize_bfgs) {
   EXPECT_FALSE(boost::contains(config[algo_idx], "lbfgs"));
 
   ASSERT_NEAR(0, values[0], 0.00001);
-  EXPECT_FLOAT_EQ(1, values[1]);
-  EXPECT_FLOAT_EQ(100, values[2]);
-  EXPECT_FLOAT_EQ(10000, values[3]);
-  EXPECT_FLOAT_EQ(1000000, values[4]);
+  auto outputs = values.size();
+
+  EXPECT_FLOAT_EQ(1, values[outputs - 4]);
+  EXPECT_FLOAT_EQ(100, values[outputs - 3]);
+  EXPECT_FLOAT_EQ(10000, values[outputs - 2]);
+  EXPECT_FLOAT_EQ(1000000, values[outputs - 1]);
 }
 
 TEST_F(CmdStan, optimize_lbfgs) {
@@ -110,10 +114,12 @@ TEST_F(CmdStan, optimize_lbfgs) {
   EXPECT_TRUE(boost::contains(config[algo_idx], "lbfgs"));
 
   ASSERT_NEAR(0, values[0], 0.00001);
-  EXPECT_FLOAT_EQ(1, values[1]);
-  EXPECT_FLOAT_EQ(100, values[2]);
-  EXPECT_FLOAT_EQ(10000, values[3]);
-  EXPECT_FLOAT_EQ(1000000, values[4]);
+  auto outputs = values.size();
+
+  EXPECT_FLOAT_EQ(1, values[outputs - 4]);
+  EXPECT_FLOAT_EQ(100, values[outputs - 3]);
+  EXPECT_FLOAT_EQ(10000, values[outputs - 2]);
+  EXPECT_FLOAT_EQ(1000000, values[outputs - 1]);
 }
 
 TEST_F(CmdStan, optimize_newton) {
@@ -135,10 +141,12 @@ TEST_F(CmdStan, optimize_newton) {
   EXPECT_TRUE(boost::contains(config[algo_idx], "newton"));
 
   ASSERT_NEAR(0, values[0], 0.00001);
-  EXPECT_FLOAT_EQ(1, values[1]);
-  EXPECT_FLOAT_EQ(100, values[2]);
-  EXPECT_FLOAT_EQ(10000, values[3]);
-  EXPECT_FLOAT_EQ(1000000, values[4]);
+  auto outputs = values.size();
+
+  EXPECT_FLOAT_EQ(1, values[outputs - 4]);
+  EXPECT_FLOAT_EQ(100, values[outputs - 3]);
+  EXPECT_FLOAT_EQ(10000, values[outputs - 2]);
+  EXPECT_FLOAT_EQ(1000000, values[outputs - 1]);
 }
 
 TEST_F(CmdStan, optimize_jacobian_adjust) {
@@ -158,8 +166,9 @@ TEST_F(CmdStan, optimize_jacobian_adjust) {
   EXPECT_NE(jacobian_idx, -1);
   EXPECT_TRUE(boost::contains(config1[jacobian_idx], "= false (Default)"));
 
+  auto outputs = values1.size();
   ASSERT_NEAR(0, values1[0], 0.00001);
-  ASSERT_NEAR(3, values1[1], 0.01);
+  ASSERT_NEAR(3, values1[outputs - 1], 0.01);
 
   ss.str(std::string());
   ss << convert_model_path(simple_jacobian_model) << " random seed=1234"
@@ -176,5 +185,5 @@ TEST_F(CmdStan, optimize_jacobian_adjust) {
   EXPECT_NE(jacobian_idx, -1);
   EXPECT_TRUE(boost::contains(config2[jacobian_idx], "= true"));
 
-  ASSERT_NEAR(3.3, values2[1], 0.01);
+  ASSERT_NEAR(3.3, values2[outputs - 1], 0.01);
 }