address additional comments from roryyorke in PR #135

murrayrm · murrayrm · commit 68b5dd153d67 · 2017-12-29T14:56:42.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ __conda_*.txt
 record.txt
 build.log
 *.egg-info/
+.eggs/
 .coverage
 doc/_build
 doc/generated
@@ -18,4 +19,7 @@ examples/.ipynb_checkpoints/
 .project
 Untitled*.ipynb
 *.idea/
-.eggs
+
+# Files created by or for emacs (RMM, 29 Dec 2017)
+*~
+TAGS
diff --git a/control/tests/xferfcn_input_test.py b/control/tests/xferfcn_input_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# xferfcn_test.py - test TransferFunction class
-# RMM, 30 Mar 2011 (based on TestXferFcn from v0.4a)
+# xferfcn_input_test.py - test inputs to TransferFunction class
+# jed-frey, 18 Feb 2017 (based on xferfcn_test.py)
 
 import unittest
 import numpy as np
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -10,7 +10,6 @@
 # Python 3 compatibility (needs to go here)
 from __future__ import print_function
 from __future__ import division
-from __future__ import absolute_import
 
 """Copyright (c) 2010 by California Institute of Technology
 All rights reserved.
@@ -170,13 +169,6 @@ def __init__(self, *args):
                 if zeronum:
                     den[i][j] = ones(1)
 
-                # Check for coefficients that are ints and convert to floats
-                # TODO
-                for k in range(den[i][j]):
-                    if (isinstance(data[i], (int, np.int))):
-                        den[i][j][k] = float(den[i][j][k])
-
-
         LTI.__init__(self, inputs, outputs, dt)
         self.num = num
         self.den = den
@@ -1338,18 +1330,18 @@ def _cleanPart(data):
     
     Returns
     -------
-    data: correctly formatted transfer function part.
+    data: list of lists of ndarrays, with int converted to float
     '''
     valid_types = (int, float, complex, np.number)
     valid_collection = (list, tuple, ndarray)
 
     if (isinstance(data, valid_types) or
         (isinstance(data, ndarray) and data.ndim == 0)):
         # Data is a scalar (including 0d ndarray)
-        return [[array([data])]]
+        data = [[array([data])]]
     elif (isinstance(data, valid_collection) and
             all([isinstance(d, valid_types) for d in data])):
-        return [[array(data]]
+        data = [[array(data)]]
     elif (isinstance(data, (list, tuple)) and
           isinstance(data[0], (list, tuple)) and
               (isinstance(data[0][0], valid_collection) and 
@@ -1359,10 +1351,19 @@ def _cleanPart(data):
             data[j] = list(data[j])
             for k in range(len(data[j])):
                 data[j][k] = array(data[j][k])
-        return data
     else:
         # If the user passed in anything else, then it's unclear what
         # the meaning is.
         raise TypeError("The numerator and denominator inputs must be \
 scalars or vectors (for\nSISO), or lists of lists of vectors (for SISO or \
 MIMO).")
+
+    # Check for coefficients that are ints and convert to floats
+    for i in range(len(data)):
+        for j in range(len(data[i])):
+            for k in range(len(data[i][j])):
+                if (isinstance(data[i][j][k], (int, np.int))):
+                    data[i][j][k] = float(data[i][j][k])
+                
+    return data
+    

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`	`#`
`3`		`-# xferfcn_test.py - test TransferFunction class`
`4`		`-# RMM, 30 Mar 2011 (based on TestXferFcn from v0.4a)`
	`3`	`+# xferfcn_input_test.py - test inputs to TransferFunction class`
	`4`	`+# jed-frey, 18 Feb 2017 (based on xferfcn_test.py)`
`5`	`5`
`6`	`6`	`import unittest`
`7`	`7`	`import numpy as np`