remove _NamedIOStateSystem class

murrayrm · murrayrm · commit 96d813cfdc02 · 2022-04-01T21:19:49.000-07:00
diff --git a/control/iosys.py b/control/iosys.py
@@ -31,7 +31,7 @@
 import copy
 from warnings import warn
 
-from .namedio import _NamedIOStateSystem, _process_signal_list
+from .namedio import _NamedIOSystem, _process_signal_list
 from .statesp import StateSpace, tf2ss, _convert_to_statespace
 from .statesp import _ss, _rss_generate
 from .xferfcn import TransferFunction
@@ -55,7 +55,7 @@
 }
 
 
-class InputOutputSystem(_NamedIOStateSystem):
+class InputOutputSystem(_NamedIOSystem):
     """A class for representing input/output systems.
 
     The InputOutputSystem class allows (possibly nonlinear) input/output
@@ -139,7 +139,7 @@ def __init__(self, inputs=None, outputs=None, states=None, params={},
 
         """
         # Store the system name, inputs, outputs, and states
-        _NamedIOStateSystem.__init__(
+        _NamedIOSystem.__init__(
             self, inputs=inputs, outputs=outputs, states=states, name=name)
 
         # default parameters
diff --git a/control/namedio.py b/control/namedio.py
@@ -1,10 +1,9 @@
 # namedio.py - internal named I/O object class
 # RMM, 13 Mar 2022
 #
-# This file implements the _NamedIOSystem and _NamedIOStateSystem classes,
-# which are used as a parent classes for FrequencyResponseData,
-# InputOutputSystem, LTI, TimeResponseData, and other similar classes to
-# allow naming of signals.
+# This file implements the _NamedIOSystem class, which is used as a parent
+# class for FrequencyResponseData, InputOutputSystem, LTI, TimeResponseData,
+# and other similar classes to allow naming of signals.
 
 import numpy as np
 
@@ -19,14 +18,15 @@ def _name_or_default(self, name=None):
         return name
 
     def __init__(
-            self, inputs=None, outputs=None, name=None):
+            self, name=None, inputs=None, outputs=None, states=None):
 
         # system name
         self.name = self._name_or_default(name)
 
         # Parse and store the number of inputs and outputs
         self.set_inputs(inputs)
         self.set_outputs(outputs)
+        self.set_states(states)
 
     #
     # Class attributes
@@ -38,12 +38,17 @@ def __init__(
     #: Number of system inputs.
     #:
     #: :meta hide-value:
-    ninputs = 0
+    ninputs = None
 
     #: Number of system outputs.
     #:
     #: :meta hide-value:
-    noutputs = 0
+    noutputs = None
+
+    #: Number of system states.
+    #:
+    #: :meta hide-value:
+    nstates = None
 
     def __repr__(self):
         return str(type(self)) + ": " + self.name if self.name is not None \
@@ -58,6 +63,10 @@ def __str__(self):
         str += "\nOutputs (%s): " % self.noutputs
         for key in self.output_index:
             str += key + ", "
+        if self.nstates is not None:
+            str += "\nStates (%s): " % self.nstates
+            for key in self.state_index:
+                str += key + ", "
         return str
 
     # Find a signal by name
@@ -122,44 +131,6 @@ def find_output(self, name):
         lambda self: list(self.output_index.keys()),     # getter
         set_outputs)                                     # setter
 
-    def issiso(self):
-        """Check to see if a system is single input, single output"""
-        return self.ninputs == 1 and self.noutputs == 1
-
-
-class _NamedIOStateSystem(_NamedIOSystem):
-    def __init__(
-            self, inputs=None, outputs=None, states=None, name=None):
-        # Parse and store the system name, inputs, and outputs
-        super().__init__(inputs=inputs, outputs=outputs, name=name)
-
-        # Parse and store the number of states
-        self.set_states(states)
-
-    #
-    # Class attributes
-    #
-    # These attributes are defined as class attributes so that they are
-    # documented properly.  They are "overwritten" in __init__.
-    #
-
-    #: Number of system states.
-    #:
-    #: :meta hide-value:
-    nstates = 0
-
-    def __str__(self):
-        """String representation of an input/output system"""
-        str = _NamedIOSystem.__str__(self)
-        str += "\nStates (%s): " % self.nstates
-        for key in self.state_index:
-            str += key + ", "
-        return str
-
-    def _isstatic(self):
-        """Check to see if a system is a static system (no states)"""
-        return self.nstates == 0
-
     def set_states(self, states, prefix='x'):
         """Set the number/names of the system states.
 
@@ -189,6 +160,14 @@ def find_state(self, name):
         lambda self: list(self.state_index.keys()),     # getter
         set_states)                                     # setter
 
+    def issiso(self):
+        """Check to see if a system is single input, single output"""
+        return self.ninputs == 1 and self.noutputs == 1
+
+    def _isstatic(self):
+        """Check to see if a system is a static system (no states)"""
+        return self.nstates == 0
+
 
 # Utility function to parse a list of signals
 def _process_signal_list(signals, prefix='s'):
diff --git a/control/statesp.py b/control/statesp.py
@@ -59,7 +59,7 @@
 from scipy.signal import StateSpace as signalStateSpace
 from warnings import warn
 from .lti import LTI, common_timebase, isdtime, _process_frequency_response
-from .namedio import _NamedIOStateSystem, _process_signal_list
+from .namedio import _NamedIOSystem, _process_signal_list
 from . import config
 from copy import deepcopy
 
@@ -153,7 +153,7 @@ def _f2s(f):
     return s
 
 
-class StateSpace(LTI, _NamedIOStateSystem):
+class StateSpace(LTI, _NamedIOSystem):
     """StateSpace(A, B, C, D[, dt])
 
     A class for representing state-space models.
