From 0378fc0b2872227965a7e35d73c2f0ea522e4f03 Mon Sep 17 00:00:00 2001 From: Matthew Dawson Date: Wed, 7 May 2014 17:37:09 -0700 Subject: [PATCH] Start reading more property related fields. To support multiple objects with differing field values for the same class type, it is now necessary to actually parse segment 4 and act accordingly. Thus do that, and add a test to ensure the behaviour is correct. --- .../mjdsystems/jmatio/io/MatFileReader.java | 50 ++++++++++++++++- .../jmatio/io/MatMCOSObjectInformation.java | 6 ++- .../jmatio/test/MatlabMCOSTest.java | 51 ++++++++++++++++++ .../mcos/simplesingletext_multiple.mat | Bin 0 -> 1728 bytes 4 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/mcos/simplesingletext_multiple.mat diff --git a/src/main/java/ca/mjdsystems/jmatio/io/MatFileReader.java b/src/main/java/ca/mjdsystems/jmatio/io/MatFileReader.java index 2842303..3720233 100755 --- a/src/main/java/ca/mjdsystems/jmatio/io/MatFileReader.java +++ b/src/main/java/ca/mjdsystems/jmatio/io/MatFileReader.java @@ -518,7 +518,7 @@ public class MatFileReader MatMCOSObjectInformation objHolder = objectInfoList.get(objectId - 1); if (objHolder == null) { - objHolder = new MatMCOSObjectInformation(classNamesList.get(classIndex - 1), classIndex, objectId); + objHolder = new MatMCOSObjectInformation(classNamesList.get(classIndex - 1), classIndex, objectId, segment4Index); objectInfoList.put(objectId - 1, objHolder); } @@ -529,6 +529,54 @@ public class MatFileReader throw new IllegalStateException("Data from the object section was not all read! At: " + mcosDataBuf.position() + ", wanted: " + segmentIndexes[3]); } + // Fourth segment. Contains the regular properties for objects. + // There are 8 unknown bytes. Ensure they are 0. + if (mcosDataBuf.getLong() != 0) { + throw new IllegalStateException("MAT file's MCOS data has different byte values for unknown fields! Aborting!"); + } + List> segment4Properties = new ArrayList>(); + int propertiesIndex = 0; + while (mcosDataBuf.position() < segmentIndexes[4]) { + Map properties = new HashMap(); + int propertiesCount = mcosDataBuf.getInt(); + for (int i = 0; i < propertiesCount; ++i) { + int nameIndex = mcosDataBuf.getInt(); + int flag = mcosDataBuf.getInt(); + int heapIndex = mcosDataBuf.getInt(); + + String propertyName = strs[nameIndex - 1]; + switch (flag) { + case 0: + properties.put(propertyName, new MLChar(propertyName, strs[heapIndex-1])); + break; + case 1: + properties.put(propertyName, mcosInfo.get(heapIndex+2)); + break; + case 2: + // @todo: Handle a boolean. + throw new UnsupportedOperationException("Mat file parsing does not yet support booleans!"); + } + } + segment4Properties.add(properties); + mcosDataBuf.position((mcosDataBuf.position() + 0x07) & ~0x07); + } + + + // Sanity check, position in the buffer should equal the start of the fourth segment! + if (mcosDataBuf.position() != segmentIndexes[4]) { + throw new IllegalStateException("Data from the properties section (2) was not all read! At: " + mcosDataBuf.position() + ", wanted: " + segmentIndexes[4]); + } + + // Now merge in the properties from segment 4 into object. + for (MatMCOSObjectInformation it : objectInfoList.values()) { + MLStructure objAttributes = it.structure; + if (it.segment4PropertiesIndex > 0) { + for (Map.Entry attribute : segment4Properties.get(it.segment4PropertiesIndex - 1).entrySet()) { + objAttributes.setField(attribute.getKey(), attribute.getValue()); + } + } + } + // Finally, merge in attributes from the global grab bag. MLCell attribBag = (MLCell) mcosInfo.get(mcosInfo.getSize() -1); // Get the grab bag. for (MatMCOSObjectInformation it : objectInfoList.values()) { diff --git a/src/main/java/ca/mjdsystems/jmatio/io/MatMCOSObjectInformation.java b/src/main/java/ca/mjdsystems/jmatio/io/MatMCOSObjectInformation.java index a53d705..de9ccac 100644 --- a/src/main/java/ca/mjdsystems/jmatio/io/MatMCOSObjectInformation.java +++ b/src/main/java/ca/mjdsystems/jmatio/io/MatMCOSObjectInformation.java @@ -3,7 +3,6 @@ */ package ca.mjdsystems.jmatio.io; -import ca.mjdsystems.jmatio.types.MLArray; import ca.mjdsystems.jmatio.types.MLStructure; /** @@ -11,16 +10,19 @@ import ca.mjdsystems.jmatio.types.MLStructure; * @author Matthew Dawson */ class MatMCOSObjectInformation { - MatMCOSObjectInformation(String className, int classId, int objectId) + MatMCOSObjectInformation(String className, int classId, int objectId, int segment4PropertiesIndex) { this.className = className; this.objectId = objectId; this.classId = classId; + + this.segment4PropertiesIndex = segment4PropertiesIndex; } final String className; final int objectId; final int classId; + final int segment4PropertiesIndex; final MLStructure structure = new MLStructure("", new int[]{1,1}); } diff --git a/src/test/java/ca/mjdsystems/jmatio/test/MatlabMCOSTest.java b/src/test/java/ca/mjdsystems/jmatio/test/MatlabMCOSTest.java index 573f1db..356a258 100644 --- a/src/test/java/ca/mjdsystems/jmatio/test/MatlabMCOSTest.java +++ b/src/test/java/ca/mjdsystems/jmatio/test/MatlabMCOSTest.java @@ -96,6 +96,57 @@ public class MatlabMCOSTest { assertThat(obj.getObject().getFieldNames().iterator().next(), is("test_text")); } + @Test + public void testParsingSimpleSingleTextMultipleMCOS() throws IOException + { + File file = fileFromStream("/mcos/simplesingletext_multiple.mat"); + MatFileReader reader = new MatFileReader(file); + Map content = reader.getContent(); + + assertThat(content.size(), is(3)); + + MLObject obj = (MLObject) content.get("obj1"); + assertThat(obj, is(notNullValue())); + + assertThat(obj.getName(), is("obj1")); + assertThat(obj.getClassName(), is("SimpleSingleText")); + Collection fields = obj.getObject().getAllFields(); + assertThat(fields.size(), is(1)); + + MLChar field = (MLChar) fields.toArray()[0]; + assertThat(field.getString(0), is("other text 1")); + + assertThat(obj.getObject().getFieldNames().iterator().next(), is("test_text")); + + + obj = (MLObject) content.get("obj2"); + assertThat(obj, is(notNullValue())); + + assertThat(obj.getName(), is("obj2")); + assertThat(obj.getClassName(), is("SimpleSingleText")); + fields = obj.getObject().getAllFields(); + assertThat(fields.size(), is(1)); + + field = (MLChar) fields.toArray()[0]; + assertThat(field.getString(0), is("Default text")); + + assertThat(obj.getObject().getFieldNames().iterator().next(), is("test_text")); + + + obj = (MLObject) content.get("obj3"); + assertThat(obj, is(notNullValue())); + + assertThat(obj.getName(), is("obj3")); + assertThat(obj.getClassName(), is("SimpleSingleText")); + fields = obj.getObject().getAllFields(); + assertThat(fields.size(), is(1)); + + field = (MLChar) fields.toArray()[0]; + assertThat(field.getString(0), is("other text 3")); + + assertThat(obj.getObject().getFieldNames().iterator().next(), is("test_text")); + } + private File fileFromStream(String location) throws IOException { String outname = location.replace("/", "_"); diff --git a/src/test/resources/mcos/simplesingletext_multiple.mat b/src/test/resources/mcos/simplesingletext_multiple.mat new file mode 100644 index 0000000000000000000000000000000000000000..86b9148906a8f26feaa4fad87020f8a768b71c60 GIT binary patch literal 1728 zcmcgrOG*Pl5bgLwMMZZm`v6fg8b4$g6^-Dikbv2R5jz?gO&CYe8+Zhd;t{-r_i*WZ zlRVRm;199jO?7pBruubtSZy3sx9r+-$%fU&Qo9qoqCJkIwB1dvDt7PSuvuL%7wvZ9 zqST$)?sdhUK!?%2wHr1lSJujvV8gDIg0lUlltxTn3j5(4Ru8}gFbOOGl!6&E-P6kz z>Tvt0UclZwQ14vzVps26pU1A@?o#I00OikOO&JGRkNeCeD6|)|m3d(s@=1TuPw-#; zsJAcrS^ckmMh9GF{frIyp6YY?&Nq2%!Y{sg4%!BH%~0k)p_uMVqoDiJJt%)1_fH>f zYR&>wR;TCH8O{y8j33SoXJQwFeUe1Io=aLS*zBX^OGYA^kxbFh<-p)L4H>N6kDdnfY3IOZtc zx3!ng@on-+$#{hpuN)PMKMymoRg-?c->yl)r!$GMSUGctuQkCR*IUi%P2%V3PkpFA zaiD#kXA@97{S?J3PMY)0wQS};0-xpk@ywqd