Fix: engine [input|output]_values (#76)

* Fix: engine [input|output]_values

* Version update

* Update version and history

Author: jcrada

HISTORY.md

@@ -1,3 +1,9 @@
+# Version 8.0.2
+
+### Bug fixes
+
+- Fix `engine.[input|output]_values`, which was not working correctly when manually setting variable values (issue #75).
+
 # Version 8.0.1
 
 ### Bug fixes
@@ -24,10 +30,10 @@
 - function `fl.to_float` converts any argument to a `float`, which was the behaviour of `fl.Op.scalar`.
 - linguistic terms `Arc` and `SemiEllipse`
 - indexable components:
-    - `Engine`: get variables or rule blocks by name using square brackets, eg, `engine["light"].value`
-    - `Variable`: get terms by name using square brackets, eg, `variable["low"].membership(value)`
-    - `Factory`: get constructors and objects by name using square brackets,
-      eg, `factory["Triangle"]()`, `factory["sin"](3.14)`
+  - `Engine`: get variables or rule blocks by name using square brackets, eg, `engine["light"].value`
+  - `Variable`: get terms by name using square brackets, eg, `variable["low"].membership(value)`
+  - `Factory`: get constructors and objects by name using square brackets,
+    eg, `factory["Triangle"]()`, `factory["sin"](3.14)`
 - class `Benchmark` to benchmark engines
 - `from __future__ import annotations` in every file to use better type annotations
 - class `library.Settings` to configure general settings in singleton `library.settings`

README.md

@@ -1,4 +1,4 @@
-# pyfuzzylite 8.0.1
+# pyfuzzylite 8.0.2
 
 <img src="https://fuzzylite.github.io/pyfuzzylite/image/fuzzylite.svg" align="left" alt="fuzzylite">
 

docs/index.md

@@ -1,4 +1,4 @@
-# pyfuzzylite 8.0.1
+# pyfuzzylite 8.0.2
 
 ***
 

fuzzylite/engine.py

@@ -323,9 +323,9 @@ def input_values(self) -> ScalarArray:
             ValueError: when the dimensionality of values is greater than 2
             ValueError: when the number of columns in the values is different from the number of input variables
         """
-        return np.atleast_2d(  # type:ignore
-            np.array([v.value for v in self.input_variables])
-        ).T
+        values = tuple(input_variable.value for input_variable in self.input_variables)
+        result = np.column_stack(values) if values else np.array(values)
+        return result
 
     @input_values.setter
     def input_values(self, values: ScalarArray) -> None:
@@ -379,9 +379,9 @@ def output_values(self) -> ScalarArray:
             2D array of output values (rows) for each output variable (columns).
         """
         # TODO: Maybe a property setter like input_values.
-        return np.atleast_2d(  # type:ignore
-            np.array([v.value for v in self.output_variables])
-        ).T
+        values = tuple(output_variable.value for output_variable in self.output_variables)
+        result = np.column_stack(values) if values else np.array(values)
+        return result
 
     @property
     def values(self) -> ScalarArray:

fuzzylite/library.py

@@ -272,7 +272,7 @@ def version(self) -> str:
         Returns:
             version of the library
         """
-        __version__ = "8.0.1"
+        __version__ = "8.0.2"
         return __version__
 
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyfuzzylite"
-version = "8.0.1"
+version = "8.0.2"
 description = "a fuzzy logic control library in Python"
 license = "Proprietary"
 readme = "README.md"

tests/test_engine.py

@@ -424,6 +424,97 @@ def test_input_values_setter(self) -> None:
             ),
         )
 
+    def test_input_values(self) -> None:
+        """Test the engine.input_values."""
+        engine = fl.Engine("Test")
+        np.testing.assert_equal(fl.array([]), engine.input_values)
+
+        engine = fl.Engine("Test", input_variables=[fl.InputVariable("A")])
+        engine.input_variable(0).value = 0.6
+        np.testing.assert_equal(fl.array([[0.6]]), engine.input_values)
+
+        engine.input_variable(0).value = fl.array([0.6, 0.7])
+        np.testing.assert_equal(fl.array([[0.6], [0.7]]), engine.input_values)
+
+        engine = fl.Engine("Test", input_variables=[fl.InputVariable("A"), fl.InputVariable("B")])
+        engine.input_variable(0).value = 0.6
+        engine.input_variable(1).value = 0.2
+        np.testing.assert_equal(fl.array([[0.6, 0.2]]), engine.input_values)
+
+        engine.input_variable(0).value = fl.array([0.6, 0.7])
+        engine.input_variable(1).value = fl.array([0.2, 0.3])
+        np.testing.assert_equal(fl.array([[0.6, 0.2], [0.7, 0.3]]), engine.input_values)
+
+    def test_output_values(self) -> None:
+        """Test the engine.output_values."""
+        engine = fl.Engine("Test")
+        np.testing.assert_equal(fl.array([]), engine.output_values)
+
+        engine = fl.Engine("Test", output_variables=[fl.OutputVariable("A")])
+        engine.output_variable(0).value = 0.6
+        np.testing.assert_equal(fl.array([[0.6]]), engine.output_values)
+
+        engine.output_variable(0).value = fl.array([0.6, 0.7])
+        np.testing.assert_equal(fl.array([[0.6], [0.7]]), engine.output_values)
+
+        engine = fl.Engine(
+            "Test", output_variables=[fl.OutputVariable("A"), fl.OutputVariable("B")]
+        )
+        engine.output_variable(0).value = 0.6
+        engine.output_variable(1).value = 0.2
+        np.testing.assert_equal(fl.array([[0.6, 0.2]]), engine.output_values)
+
+        engine.output_variable(0).value = fl.array([0.6, 0.7])
+        engine.output_variable(1).value = fl.array([0.2, 0.3])
+        np.testing.assert_equal(fl.array([[0.6, 0.2], [0.7, 0.3]]), engine.output_values)
+
+    def test_input_values_manual_bug(self) -> None:
+        """Test the bug raised in https://github.com/fuzzylite/pyfuzzylite/issues/75."""
+        fll = """\
+Engine: ObstacleAvoidance
+InputVariable: obstacle
+  enabled: true
+  range: 0.000 1.000
+  lock-range: false
+  term: left Ramp 1.000 0.000
+  term: right Ramp 0.000 1.000
+InputVariable: obstacle2
+  enabled: true
+  range: 0.000 1.000
+  lock-range: false
+  term: left Ramp 1.000 0.000
+  term: right Ramp 0.000 1.000
+OutputVariable: tsSteer
+  enabled: true
+  range: 0.000 1.000
+  lock-range: false
+  aggregation: Maximum
+  defuzzifier: WeightedAverage
+  default: nan
+  lock-previous: false
+  term: right Linear 1 1 0
+  term: left Linear 0 1 1
+RuleBlock: takagiSugeno
+  enabled: true
+  conjunction: Minimum
+  disjunction: none
+  implication: none
+  activation: General
+  rule: if obstacle is left and obstacle2 is left then tsSteer is right
+  rule: if obstacle is left and obstacle2 is right then tsSteer is right"""
+        engine = fl.FllImporter().from_string(fll)
+        engine.input_variable(0).value = 0.2
+        engine.input_variable(1).value = 0.6
+        engine.process()
+        np.testing.assert_allclose(0.8, engine.output_values)
+        np.testing.assert_allclose(fl.array([[0.2, 0.6, 0.8]]), engine.values)
+
+        engine.input_variable(0).value = fl.array([0.2, 0.2])
+        engine.input_variable(1).value = fl.array([0.6, 0.6])
+        engine.process()
+        np.testing.assert_allclose(fl.array([[0.8], [0.8]]), engine.output_values)
+        np.testing.assert_allclose(fl.array([[0.2, 0.6, 0.8], [0.2, 0.6, 0.8]]), engine.values)
+
     def test_repr(self) -> None:
         """Tests repr."""
         code = fl.repr(SimpleDimmer().engine)

tests/test_library.py

@@ -76,7 +76,7 @@ def test_library_exports_dir(self) -> None:
 
     def test_library_vars(self) -> None:
         """Test the library variables."""
-        __version__ = "8.0.1"
+        __version__ = "8.0.2"
         self.assertEqual(fl.__name__, "fuzzylite")
         self.assertEqual(fl.__version__, __version__)
         self.assertEqual(fl.__doc__, fl.information.description)