Fix bugs found by early adopters

bbopt · Dec 18, 2019 · 3fcc7f5 · 3fcc7f5
1 parent 0da308a
commit 3fcc7f5
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 7 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,5 +1,7 @@
 Miguel Anjos
 Romain Couderc
+Miguel Diago Martinez
+Solène Kojtych
 Guillaume Lameynardie
 Caroline Rocha
 Ludovic Salomon
diff --git a/src/Param/PbParameters.cpp b/src/Param/PbParameters.cpp
@@ -209,7 +209,9 @@ void NOMAD::PbParameters::checkAndComply( )
         throw NOMAD::InvalidParameter(__FILE__,__LINE__, s);
     }
     if ( mPS.isDefined() && ! mFS.isDefined())
+    {
         setAttributeValue("MIN_FRAME_SIZE", iPS );
+    }
 
 
 
@@ -261,10 +263,12 @@ void NOMAD::PbParameters::setGranularityAndBBInputType()
     auto bbInputType = getAttributeValueProtected<NOMAD::BBInputTypeList>("BB_INPUT_TYPE",false);
     auto lb = getAttributeValueProtected<NOMAD::ArrayOfDouble>("LOWER_BOUND",false);
     auto ub = getAttributeValueProtected<NOMAD::ArrayOfDouble>("UPPER_BOUND",false);
+    std::ostringstream oss;
 
     if (granularity.isDefined() && granularity.size() != n)
     {
-        std::string err = "Warning: Parameter GRANULARITY resized from ";
+        std::string err;
+        err = "Warning: Parameter GRANULARITY resized from ";
         err += std::to_string(granularity.size()) + " to " + std::to_string(n);
         err += ". Values may be lost.";
         std::cerr << err << std::endl;
@@ -330,6 +334,21 @@ void NOMAD::PbParameters::setGranularityAndBBInputType()
             break;
 
     }
+
+    if (!isSetByUser("BB_INPUT_TYPE"))
+    {
+        bbInputType.resize(n);
+        setAttributeValue("BB_INPUT_TYPE", bbInputType);
+    }
+
+    // By this point, bbInputType must be of size n.
+    if (n != bbInputType.size())
+    {
+        oss << "Error: BB_INPUT_TYPE " << bbInputType << " has dimension ";
+        oss << bbInputType.size() << " which is different from ";
+        oss << "problem dimension " << n;
+        throw NOMAD::InvalidParameter(__FILE__,__LINE__, oss.str());
+    }
 
     /*-----------------------------------------*/
     /*  Adjust granularity with BB_INPUT_TYPE  */
@@ -347,7 +366,6 @@ void NOMAD::PbParameters::setGranularityAndBBInputType()
                 // Ensure we have an integer
                 if (!granularity[i].isInteger())
                 {
-                    std::ostringstream oss;
                     oss << "Check: Invalid granularity[";
                     oss << i;
                     oss << "] = " << granularity[i];

diff --git a/src/Type/BBInputType.cpp b/src/Type/BBInputType.cpp
@@ -55,11 +55,14 @@
 #include "../Type/BBInputType.hpp"
 #include "../Util/ArrayOfString.hpp"
 #include "../Util/Exception.hpp"
+#include "../Util/utils.hpp"
 
 // Convert a string ("R", "I", "B") to a NOMAD::BBInputType.
-NOMAD::BBInputType NOMAD::stringToBBInputType(const std::string &s)
+NOMAD::BBInputType NOMAD::stringToBBInputType(const std::string &sConst)
 {
     NOMAD::BBInputType ret = NOMAD::BBInputType::CONTINUOUS;
+    std::string s = sConst;
+    NOMAD::toupper(s);
 
     if (s == "R")
     {

diff --git a/src/Type/BBOutputType.cpp b/src/Type/BBOutputType.cpp
@@ -55,13 +55,16 @@
 #include "../Type/BBOutputType.hpp"
 #include "../Util/ArrayOfString.hpp"
 #include "../Util/Exception.hpp"
+#include "../Util/utils.hpp"
 
 
 // Convert a string (ex "OBJ", "EB", "PB"...)
 // to a NOMAD::BBOutputType.
-NOMAD::BBOutputType NOMAD::stringToBBOutputType(const std::string &s)
+NOMAD::BBOutputType NOMAD::stringToBBOutputType(const std::string &sConst)
 {
     NOMAD::BBOutputType ret = NOMAD::BBOutputType::BBO_UNDEFINED;
+    std::string s = sConst;
+    NOMAD::toupper(s);
 
     if (s == "OBJ")
     {
@@ -123,6 +126,7 @@ NOMAD::BBOutputTypeList NOMAD::stringToBBOutputTypeList(const std::string &s)
     return bbOutputType;
 }
 
+
 // Convert a NOMAD::BBOutputTypeList into a string.
 std::string NOMAD::BBOutputTypeListToString( const BBOutputTypeList & bbotList )
 {

diff --git a/src/Type/EvalType.cpp b/src/Type/EvalType.cpp
@@ -54,14 +54,17 @@
 
 #include "../Type/EvalType.hpp"
 #include "../Util/Exception.hpp"
+#include "../Util/utils.hpp"
 
 
 // Convert a string ("BB", "SGTE")
 // to a NOMAD::EvalType.
 // "UNDEFINED" throws an exception, as well as any value other than "BB" or "SGTE".
-NOMAD::EvalType NOMAD::stringToEvalType(const std::string &s)
+NOMAD::EvalType NOMAD::stringToEvalType(const std::string &sConst)
 {
     NOMAD::EvalType ret;
+    std::string s = sConst;
+    NOMAD::toupper(s);
 
     if (s == "BB")
     {

diff --git a/src/Type/SgtelibModelFeasibilityType.cpp b/src/Type/SgtelibModelFeasibilityType.cpp
@@ -54,13 +54,16 @@
 
 #include "../Type/SgtelibModelFeasibilityType.hpp"
 #include "../Util/Exception.hpp"
+#include "../Util/utils.hpp"
 
 
 // Convert a string (ex "C", "H", "B"...)
 // to a NOMAD::SgtelibModelFeasibilityType.
-NOMAD::SgtelibModelFeasibilityType NOMAD::stringToSgtelibModelFeasibilityType(const std::string &s)
+NOMAD::SgtelibModelFeasibilityType NOMAD::stringToSgtelibModelFeasibilityType(const std::string &sConst)
 {
     auto ret = NOMAD::SgtelibModelFeasibilityType::UNDEFINED;
+    std::string s = sConst;
+    NOMAD::toupper(s);
 
     if (s == "C")
     {

diff --git a/src/Type/SgtelibModelFormulationType.cpp b/src/Type/SgtelibModelFormulationType.cpp
@@ -54,13 +54,16 @@
 
 #include "../Type/SgtelibModelFormulationType.hpp"
 #include "../Util/Exception.hpp"
+#include "../Util/utils.hpp"
 
 
 // Convert a string (ex "FS", "FSP", "EIS"...)
 // to a NOMAD::SgtelibModelFormulationType.
-NOMAD::SgtelibModelFormulationType NOMAD::stringToSgtelibModelFormulationType(const std::string &s)
+NOMAD::SgtelibModelFormulationType NOMAD::stringToSgtelibModelFormulationType(const std::string &sConst)
 {
     auto ret = NOMAD::SgtelibModelFormulationType::UNDEFINED;
+    std::string s = sConst;
+    NOMAD::toupper(s);
 
     if (s == "FS")
     {