Tweak error handling in ConvertInputFormat, bump regression tool vers…

…ion for table diff update

.github/workflows/test_pull_requests.yml

@@ -168,7 +168,7 @@ jobs:
 
     - name: Install Regression Tool
       if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure'  # always run this step as long as we actually built
-      run: pip install energyplus-regressions>=2.1.1  # could rely on the requirements.txt file maybe
+      run: pip install energyplus-regressions>=2.1.2
 
     - name: Run Regressions
       if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure'  # always run this step as long as we actually built

requirements.txt

@@ -1,5 +1,3 @@
 # requirements for building an EnergyPlus wheel
 wheel
 
-# requirements for the CI regression testing scripts
-energyplus-regressions>=2.1.1

src/ConvertInputFormat/main.cpp

@@ -255,12 +255,18 @@ bool processErrors(std::unique_ptr<IdfParser> const &idf_parser, std::unique_ptr
         displayMessage(warning);
     }
     for (auto const &error : validation_errors) {
-        if (isDDY) {
-            if ((error.find("Missing required property 'Building'") != std::string::npos) ||
-                (error.find("Missing required property 'GlobalGeometryRules'") != std::string::npos)) {
+        bool const missing_building = error.find("Missing required property 'Building'") != std::string::npos;
+        bool const missing_geometry = error.find("Missing required property 'GlobalGeometryRules'") != std::string::npos;
+        // if we encountered one of the expected missing building/geometry errors, we should handle them special
+        if (missing_building || missing_geometry) {
+            if (isDDY) { // for DDY files just ignore it completely
                 continue;
             }
+            // for other IDFs, go ahead and emit a message, but don't trigger a failure
+            displayMessage(error);
+            continue;
         }
+        // and if it wasn't a missing building or missing geometry error, we will emit that as a proper error and fail
         hasValidationErrors = true;
         displayMessage(error);
     }