of parser for windows

Author: ndem0

smithers/io/openfoam/mesh_parser.py

@@ -187,22 +187,30 @@ def parse_points_content(cls, content, is_binary, skip=10):
         :param skip: skip lines
         :return: points coordinates as numpy.array
         """
-        n = skip
-        while n < len(content):
-            lc = content[n]
-            if is_integer(lc):
-                num = int(lc)
-                if not is_binary:
-                    data = np.array([ln[1:-2].split() for ln in content[n + 2:n + 2 + num]], dtype=float)
-                else:
-                    buf = b''.join(content[n+1:])
-                    disp = struct.calcsize('c')
-                    vv = np.array(struct.unpack('{}d'.format(num*3),
-                                                buf[disp:num*3*struct.calcsize('d') + disp]))
-                    data = vv.reshape((num, 3))
-                return data
-            n += 1
-        return None
+        def parse_line(line):
+            return line.decode('utf-8').strip().replace(')', '').replace('(', '').split()
+
+        for idx, row in enumerate(content):
+            try:
+                num_points = int(row)
+                start_idx = idx+2
+                break
+            except ValueError:
+                pass
+
+        string_coords = content[start_idx:start_idx+num_points]
+
+        data = np.array(list(map(parse_line, string_coords)), dtype=float)
+        return data
+
+        #TODO binary
+        #     if is_binary:
+        #         buf = b''.join(content[n+1:])
+        #         disp = struct.calcsize('c')
+        #         vv = np.array(struct.unpack('{}d'.format(num*3),
+        #                                     buf[disp:num*3*struct.calcsize('d') + disp]))
+        #         data = vv.reshape((num, 3))
+
 
 
     @classmethod

smithers/io/vtkhandler.py

@@ -25,12 +25,12 @@ class VTKHandler(BaseVTKHandler):
     }
 
     @classmethod
-    def read(cls, filename, format='polydata'):
+    def read(cls, filename, fmt='polydata'):
 
-        if format not in cls.vtk_format.keys():
-            raise ValueError('`format` is invalid')
+        if fmt not in cls.vtk_format.keys():
+            raise ValueError('`fmt` is invalid')
 
-        reader = cls.vtk_format[format]['reader']()
+        reader = cls.vtk_format[fmt]['reader']()
         reader.SetFileName(filename)
         reader.Update()
         data_dict = cls.vtk2dict(reader.GetOutput())
@@ -57,10 +57,10 @@ def vtk2dict(cls, data):
         return result
 
     @classmethod
-    def dict2vtk(cls, data, format):
+    def dict2vtk(cls, data, fmt):
         """ TODO """
 
-        vtkdata = cls.vtk_format[format]['type']()
+        vtkdata = cls.vtk_format[fmt]['type']()
 
         vtk_points = cls._points_()
         vtk_points.SetData(cls._numpy_to_vtk_(data['points']))
@@ -78,13 +78,13 @@ def dict2vtk(cls, data, format):
         return vtkdata
 
     @classmethod
-    def write(cls, filename, data, format='polydata'):
+    def write(cls, filename, data, fmt='polydata'):
 
-        if format not in cls.vtk_format.keys():
-            raise ValueError('`format` is invalid')
+        if fmt not in cls.vtk_format.keys():
+            raise ValueError('`fmt` is invalid')
 
-        vtkdata = cls.dict2vtk(data, format)
-        writer = cls.vtk_format[format]['writer']()
+        vtkdata = cls.dict2vtk(data, fmt)
+        writer = cls.vtk_format[fmt]['writer']()
         writer.SetFileName(filename)
         writer.SetInputData(vtkdata)
         writer.Write()

smithers/io/vtphandler.py

@@ -7,8 +7,8 @@ class VTPHandler(VTKHandler):
 
     @classmethod
     def read(cls, filename):
-        return super().read(filename, format=cls.cls_format)
+        return super().read(filename, fmt=cls.cls_format)
 
     @classmethod
     def write(cls, filename, data):
-        super().write(filename, data, format=cls.cls_format)
+        super().write(filename, data, fmt=cls.cls_format)

tests/test_objhandler.py

@@ -40,8 +40,8 @@ def test_write():
     ]
     x.polygons = [[0, 1, 2], [2, 1, 0]]
 
-    save_obj(x, "/var/tmp/data.obj")
-    assert cmp("/var/tmp/data.obj", "tests/test_datasets/file.obj")
+    save_obj(x, "data.obj")
+    assert cmp("data.obj", "tests/test_datasets/file.obj")
 
 def test_boundary():
     x = WavefrontOBJ()

tests/test_vtkhandler.py

@@ -14,7 +14,7 @@ def test_polydata():
 
 
 def test_grid():
-    data = VTKHandler.read(ugrid_file, format='unstructured')
+    data = VTKHandler.read(ugrid_file, fmt='unstructured')
     np.testing.assert_array_almost_equal(data["points"][-1], [10] * 3)
     np.testing.assert_array_almost_equal(data["points"][0], [0] * 3)
     np.testing.assert_equal(data["cells"][5], [5, 6, 17, 16, 126, 127, 138, 137])