Merge branch 'release/v0.3.4'

t-sommer · t-sommer · commit c6ff066a0021 · 2019-02-14T13:23:32.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ nosetests.xml
 # data files
 *.h5
 *.mat
+!DoublePendulum.mat
 
 # temp files
 ~*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
-## [0.3.3] (2017-12-13)
+## v0.3.4 (2019-02-14)
+
+Apply sign when reading time series from Dymola result files (.mat)
+
+## v0.3.3 (2017-12-13)
 
 ### Changed
-- Distribution package changed from .tar.gz to .whl (Python Wheel)
 
-## [0.3.2] (2017-07-09)
+Distribution package changed from .tar.gz to .whl (Python Wheel)
+
+## v0.3.2 (2017-07-09)
 
 ### Added
-- Support for Linux and Mac
+
+Add support for Linux and Mac
diff --git a/README.rst b/README.rst
@@ -72,7 +72,7 @@ Get the scale for the first dimension:
 
 -----------------------------
 
-|copyright| 2017 |Dassault Systemes|
+|copyright| 2019 |Dassault Systemes|
 
 .. _SDF specification: https://github.com/ScientificDataFormat/SDF
 .. _HDF5: https://www.hdfgroup.org/hdf5/
diff --git a/sdf/__init__.py b/sdf/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Dassault Systemes. All rights reserved.
+# Copyright (c) 2019 Dassault Systemes. All rights reserved.
 
 import numpy as np
 from .units import convert_unit
@@ -7,7 +7,7 @@
 
 from . import hdf5
 
-__version__ = '0.3.3'
+__version__ = '0.3.4'
 
 _object_name_pattern = re.compile('[a-zA-Z][a-zA-Z0-9_]*')
 
diff --git a/sdf/dsres.py b/sdf/dsres.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Dassault Systemes. All rights reserved.
+# Copyright (c) 2019 Dassault Systemes. All rights reserved.
 
 import numpy as np
 from sdf import Group, Dataset
@@ -130,9 +130,9 @@ def _load_mat(filename):
             pass
 
         if d == 1:
-            data = cons[c, 0]
+            data = cons[c, 0] * s
         else:
-            data = traj[c, :]
+            data = traj[c, :] * s
 
         if 'type' in info:
             if info['type'] == 'Integer' or 'Boolean':
diff --git a/sdf/hdf5.py b/sdf/hdf5.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Dassault Systemes. All rights reserved.
+# Copyright (c) 2019 Dassault Systemes. All rights reserved.
 
 import h5py
 import sdf
diff --git a/sdf/ndtable.py b/sdf/ndtable.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Dassault Systemes. All rights reserved.
+# Copyright (c) 2019 Dassault Systemes. All rights reserved.
 
 from ctypes import c_double, c_void_p, c_int, byref, cdll
 import numpy as np
diff --git a/sdf/units.py b/sdf/units.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Dassault Systemes. All rights reserved.
+# Copyright (c) 2019 Dassault Systemes. All rights reserved.
 
 import math
 
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def readme():
 
 
 setup(name='SDF',
-      version='0.3.3',
+      version='0.3.4',
       description="Work with Scientific Data Format files in Python",
       long_description=readme(),
       url="https://github.com/ScientificDataFormat/SDF-Python",
diff --git a/tests/DoublePendulum.mat b/tests/DoublePendulum.mat
diff --git a/tests/test_sdf.py b/tests/test_sdf.py
@@ -247,13 +247,12 @@ def test_dsres_load_all(self):
 
         s = g['Time']
         self.assertEqual(s.data.size, 552)
-        self.assertEqual(s.data.dtype, np.float32)
+        self.assertEqual(s.data.dtype, np.dtype(np.float32))
         self.assertEqual(s.unit, 's')
         self.assertEqual(s.comment, 'Simulation time')
 
         ds = g['booleanPulse2']['period']
         self.assertEqual(ds.data, 2.0)
-        self.assertEqual(ds.data.dtype, np.float32)
         self.assertEqual(ds.unit, 's')
         self.assertEqual(ds.comment, 'Time for one period')
 
@@ -278,26 +277,31 @@ def test_dsres_load_dataset(self):
         ds = sdf.load(filename, objectname='/booleanPulse2/period')
 
         self.assertEqual(ds.data, 2.0)
-        self.assertEqual(ds.data.dtype, np.float32)
         self.assertEqual(ds.unit, 's')
         self.assertEqual(ds.comment, 'Time for one period')
 
         ds = sdf.load(filename, objectname='/booleanPulse2/y')
-        self.assertEqual(ds.data.dtype, np.int32)
+        self.assertEqual(ds.data.dtype, np.dtype(np.int32))
         self.assertEqual(ds.data.size, 552)
         self.assertEqual(ds.data[0], True)
         self.assertEqual(ds.data[93], False)
 
         s = ds.scales[0]
         self.assertEqual(s.data.size, 552)
-        self.assertEqual(s.data.dtype, np.float32)
+        self.assertEqual(s.data.dtype, np.dtype(np.float32))
         self.assertEqual(s.unit, 's')
         self.assertEqual(s.comment, 'Simulation time')
 
         ds = sdf.load(filename, objectname='/integerConstant/k')
-        self.assertEqual(ds.data.dtype, np.int32)
+        self.assertEqual(ds.data.dtype, np.dtype(np.int32))
         self.assertEqual(ds.data, 1)
 
+    def test_dsres_inverted_signals(self):
+        path = os.path.dirname(__file__)
+        filename = os.path.join(path, 'DoublePendulum.mat')
+        rvisobj = sdf.load(filename, '/world/y_label/cylinders[2]/rvisobj[1]')
+        self.assertTrue(rvisobj.data < 0)
+
     @skipIf(platform.system() != 'Windows', "Test requires display")
     def test_interp_1d_example(self):
         runpy.run_module('sdf.examples.interp_1d')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2017 Dassault Systemes. All rights reserved.`
	`1`	`+# Copyright (c) 2019 Dassault Systemes. All rights reserved.`
`2`	`2`
`3`	`3`	`import h5py`
`4`	`4`	`import sdf`