Merge pull request #2 from katevrsv/main

Исправлены тесты для rastrigin

Author: LebedevIlyaG

tests/src/test_problems.cpp

@@ -99,64 +99,69 @@ void SetProblem(string libName, string confName, char* dim, GlobalOptimizationPr
 //}
 //
 //// ------------------------------------------------------------------------------------------------
-//TEST(Problem_rastrigin, test_rastrigin)
-//{
-//  //rastrigin.dll
-//  IGlobalOptimizationProblem* problem = 0;
-//  string libName = "rastrigin";
-//  string confName = "";
-//  int Dimension = 2;
-//  char dim[2] = { '0' + char(Dimension), 0 };
-//
-//  double* y = new double[Dimension];
-//  int size = 0;
-//  double* lower = new double[Dimension];
-//  double* upper = new double[Dimension];
-//
-//  double l = -2.2;
-//  double u = 1.8;
-//
-//  double val = 3.8396601125010505;
-//
-//  for (int i = 0; i < Dimension; i++)
-//  {
-//    y[i] = 0.1;
-//    lower[i] = 0;
-//    upper[i] = 0;
-//  }
-//
-//  TProblemManager manager;
-//  TParameters parameters;
-//
-//  SetProblem(libName, confName, dim, parameters, manager, problem);
-//
-//  EXPECT_DOUBLE_EQ(problem->CalculateFunctionals(y, 0), val);
-//
-//  ASSERT_EQ(problem->GetDimension(), 2);
-//
-//  ASSERT_EQ(problem->GetAllOptimumPoint(y, size), IGlobalOptimizationProblem::PROBLEM_UNDEFINED);
-//
-//  ASSERT_NO_THROW(problem->GetBounds(lower, upper));
-//
-//  for (int i = 0; i < Dimension; i++)
-//  {
-//    EXPECT_DOUBLE_EQ(lower[i], l);
-//    EXPECT_DOUBLE_EQ(upper[i], u);
-//  }
-//
-//  ASSERT_EQ(problem->GetNumberOfConstraints(), 0);
-//
-//  ASSERT_EQ(problem->GetNumberOfCriterions(), 1);
-//
-//  ASSERT_EQ(problem->GetNumberOfFunctions(), 1);
-//
-//  ASSERT_EQ(problem->GetOptimumPoint(y), IGlobalOptimizationProblem::PROBLEM_OK);
-//
-//  ASSERT_EQ(problem->GetOptimumValue(val), IGlobalOptimizationProblem::PROBLEM_OK);
-//
-//  EXPECT_DOUBLE_EQ(problem->CalculateFunctionals(y, 0), val);
-//}
-//
+TEST(Problem_rastrigin, test_rastrigin)
+{
+    //rastrigin.dll
+    IGlobalOptimizationProblem* problem = nullptr;
+    std::string libName = "rastrigin";
+    std::string confName = "";
+    int Dimension = 2;
+    char dim[2] = { '0' + static_cast<char>(Dimension), '\0' };
+
+    std::vector<double> y(Dimension);
+    int size = 0;
+    std::vector<double> lower(Dimension);
+    std::vector<double> upper(Dimension);
+
+    double l = -2.2;
+    double u = 1.8;
+
+    double val = 3.8396601125010505;
+
+    for (int i = 0; i < Dimension; i++)
+    {
+        y[i] = 0.1;
+        lower[i] = 0;
+        upper[i] = 0;
+    }
+
+    GlobalOptimizationProblemManager manager;
+
+    std::string libPath = std::string(TESTDATA_BIN_PATH) + "/" + libName + ".dll";
+    ASSERT_EQ(InitGlobalOptimizationProblem(manager, problem, libPath), 0);
+    ASSERT_NE(problem, nullptr);
+
+    ASSERT_EQ(problem->SetDimension(Dimension), IGlobalOptimizationProblem::PROBLEM_OK);
+
+    std::vector<std::string> strs;
+
+    ASSERT_EQ(problem->GetDimension(), 2);
+    
+    std::vector<std::vector<double>> yVector = { y };
+    std::vector<std::vector<std::string>> strVector = { strs };
+    ASSERT_EQ(problem->GetAllOptimumPoint(yVector, strVector, size), IGlobalOptimizationProblem::PROBLEM_UNDEFINED);
+
+    ASSERT_NO_THROW(problem->GetBounds(lower, upper));
+
+    for (int i = 0; i < Dimension; i++)
+    {
+        EXPECT_DOUBLE_EQ(lower[i], l);
+        EXPECT_DOUBLE_EQ(upper[i], u);
+    }
+
+    ASSERT_EQ(problem->GetNumberOfConstraints(), 0);
+
+    ASSERT_EQ(problem->GetNumberOfCriterions(), 1);
+
+    ASSERT_EQ(problem->GetNumberOfFunctions(), 1);
+
+    ASSERT_EQ(problem->GetOptimumPoint(y, strs), IGlobalOptimizationProblem::PROBLEM_OK);
+
+    ASSERT_EQ(problem->GetOptimumValue(val), IGlobalOptimizationProblem::PROBLEM_OK);
+
+    EXPECT_DOUBLE_EQ(problem->CalculateFunctionals(y,strs, 0), val);
+}
+
 //// ------------------------------------------------------------------------------------------------
 //TEST(Problem_gklsC, test_gklsC)
 //{