fixes #3673

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25587 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.modelica/src/org/simantics/modelica/data/Mat4Reader.java b/org.simantics.modelica/src/org/simantics/modelica/data/Mat4Reader.java
index ceafe6b0b097a3f971372654d7a2dc6f5d2936c0..0ed50f52a4a2c5475ddf888d54cb9ca87e46e376 100644 (file)
--- a/org.simantics.modelica/src/org/simantics/modelica/data/Mat4Reader.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/data/Mat4Reader.java
@@ -142,7 +142,7 @@ public class Mat4Reader {
             int size = values.columns % outputInterval != 0 ? values.columns / outputInterval + 1 : values.columns; \r
             double[] v = new double[size];\r
             int sc = infoData[i*4+1];\r
-            int c = sc > 0 ? sc-1 : 1-sc;\r
+            int c = sc > 0 ? sc-1 : -sc-1;\r
             //System.out.println("i=" + i + ", sc=" + sc + ", c=" + c);\r
             for(int j=0;j<v.length;++j) {\r
                int adjusted = j * outputInterval;\r

diff --git a/org.simantics.modelica/src/org/simantics/modelica/reader/MatFileReader.java b/org.simantics.modelica/src/org/simantics/modelica/reader/MatFileReader.java
index 84b20e642330da89b1391d5ba7c44aebb80f6367..85074f8fa5d43e4246bec2b30422d0b32ad89d4a 100644 (file)
--- a/org.simantics.modelica/src/org/simantics/modelica/reader/MatFileReader.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/reader/MatFileReader.java
@@ -313,7 +313,7 @@ public class MatFileReader implements ResultFileReader {
                int rows = header.rows;\r
                double[] v = new double[size];\r
                int sc = infoData[column * 4 + 1];\r
-               int c = sc > 0 ? sc-1 : 1-sc;\r
+               int c = sc > 0 ? sc-1 : -sc-1;\r
                \r
 \r
 \r
@@ -345,7 +345,7 @@ public class MatFileReader implements ResultFileReader {
                int rows = header.rows;\r
                double[] v = new double[count];\r
                int sc = infoData[row * 4 + 1];\r
-               int c = sc > 0 ? sc-1 : 1-sc;\r
+               int c = sc > 0 ? sc-1 : -sc-1;\r
                \r
 \r
 \r
@@ -366,9 +366,6 @@ public class MatFileReader implements ResultFileReader {
        \r
        private double[][] readRows(MatrixHeader header, List<Integer> unSortedRows, InputStream in)throws IOException {\r
 \r
-               \r
-               ;\r
-               \r
                if (header.type != 0)\r
                throw new IOException("Only double type supported");\r
                for (int row : unSortedRows)\r
@@ -383,7 +380,7 @@ public class MatFileReader implements ResultFileReader {
                        int row = unSortedRows.get(i);\r
                        //vs[i] = new double[size];\r
                        usc[i] = infoData[row * 4 + 1];\r
-                       uc[i] = usc[i] > 0 ? usc[i]-1 : 1-usc[i];\r
+                       uc[i] = usc[i] > 0 ? usc[i]-1 : -usc[i]-1;\r
                }\r
                \r
                //Map<Integer, Integer> cToRow = new HashMap<Integer, Integer>();\r
@@ -503,7 +500,7 @@ public class MatFileReader implements ResultFileReader {
                        int row = unSortedRows.get(i);\r
                        //vs[i] = new double[count];\r
                        usc[i] = infoData[row * 4 + 1];\r
-                       uc[i] = usc[i] > 0 ? usc[i]-1 : 1-usc[i];\r
+                       uc[i] = usc[i] > 0 ? usc[i]-1 : -usc[i]-1;\r
                }\r
                \r
                //Map<Integer, Integer> cToRow = new HashMap<Integer, Integer>();\r