Test: Norms

fuzzylite · Mar 7, 2024 · 1b06e2e · 1b06e2e
1 parent 0e91f81
commit 1b06e2e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ install:
 
 coverage:
 	# pip install gcovr
-	gcovr -r src/ build/CMakeFiles/fl-test.dir/ --coveralls build/coveralls.json --html build/coverage.html --html-details --sort uncovered-percent --html-theme github.dark-blue --txt --txt-summary --filter src/norm
+	gcovr -r src/ build/CMakeFiles/fl-test.dir/ --coveralls build/coveralls.json --html build/coverage.html --html-details --sort uncovered-percent --html-theme github.dark-blue --txt --txt-summary
 	# open build/coverage.html
 
 clean-coverage:

diff --git a/test/TestNorm.cpp b/test/TestNorm.cpp
@@ -138,9 +138,9 @@ namespace fuzzylite {
                     {1.00, 0.50, 0.50},
                     {1.00, 0.75, 0.75},
                     {1.00, 1.00, 1.00},
-                    //                    {nan, nan, nan},
+                    {nan, nan, nan},
                     {inf, inf, inf},
-                    //                    {inf, -inf, nan},
+                    {inf, -inf, nan},
                     {-inf, -inf, 0},
                 });
         }
@@ -244,7 +244,7 @@ namespace fuzzylite {
                     {1.00, 1.00, 1.00},
                     {nan, nan, nan},
                     {inf, inf, inf},
-                    //                    {inf, -inf, -inf},
+                    {inf, -inf, -inf},
                     {-inf, -inf, -inf},
                 });
         }
@@ -327,6 +327,15 @@ namespace fuzzylite {
                     {inf, -inf, nan},
                     {-inf, -inf, -inf},
                 });
+
+            auto f = TNormFunction("a*b");
+            CHECK(f.getFormula() == "a*b");
+            f.setFormula("(a*b)/2");
+            CHECK(f.getFormula() == "(a*b)/2");
+            CHECK(f.function().isLoaded());
+            const auto constructor
+                = FL_unique_ptr<TNormFunction>(dynamic_cast<TNormFunction*>(TNormFunction::constructor()));
+            CHECK(not constructor->function().isLoaded());
         }
 
         SECTION("BoundedSum") {
@@ -348,9 +357,9 @@ namespace fuzzylite {
                     {1.00, 0.50, 1.00},
                     {1.00, 0.75, 1.00},
                     {1.00, 1.00, 1.00},
-                    //                    {nan, nan, nan},
+                    {nan, nan, nan},
                     {inf, inf, 1.0},
-                    //                    {inf, -inf, nan},
+                    {inf, -inf, nan},
                     {-inf, -inf, -inf},
                 });
         }
@@ -452,7 +461,7 @@ namespace fuzzylite {
                     {1.00, 1.00, 1.00},
                     {nan, nan, nan},
                     {inf, inf, inf},
-                    //                    {inf, -inf, inf},
+                    {inf, -inf, inf},
                     {-inf, -inf, -inf},
                 });
         }
@@ -555,6 +564,14 @@ namespace fuzzylite {
                     {inf, -inf, nan},
                     {-inf, -inf, -inf},
                 });
+            auto f = SNormFunction("a+b");
+            CHECK(f.getFormula() == "a+b");
+            f.setFormula("(a+b)/2");
+            CHECK(f.getFormula() == "(a+b)/2");
+            CHECK(f.function().isLoaded());
+            const auto constructor
+                = FL_unique_ptr<SNormFunction>(dynamic_cast<SNormFunction*>(SNormFunction::constructor()));
+            CHECK(not constructor->function().isLoaded());
         }
     }