Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/mcos.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,10 @@ EnterFieldNameObject(const mcos_subsystem_t *ss, mat_uint32_t obj_id, char ***al
}
}

default_props = GetDefaultPropsForClass(ss, obj_info->class_id);
/* A saveobj return value replaces the object, so class defaults do not apply */
default_props = obj_info->saveobj_id > 0 && obj_info->saveobj_id <= ss->num_saveobj_props
? NULL
: GetDefaultPropsForClass(ss, obj_info->class_id);
err = CollectFieldNamesFromStruct(default_props, all_fieldnames, count, capacity);
if ( err )
return err;
Expand Down Expand Up @@ -912,7 +915,10 @@ GetFieldValueFromObject(const mcos_subsystem_t *ss, mat_uint32_t obj_id, const c
if ( EnterFieldValueObject(ss, child_id, fname, visited, stack, &top, &result) )
return result;
} else {
const matvar_t *default_props = GetDefaultPropsForClass(ss, obj_info->class_id);
const matvar_t *default_props =
obj_info->saveobj_id > 0 && obj_info->saveobj_id <= ss->num_saveobj_props
? NULL
: GetDefaultPropsForClass(ss, obj_info->class_id);
top--;
if ( default_props != NULL && default_props->class_type == MAT_C_STRUCT ) {
const matvar_t *def_field = Mat_VarGetStructFieldByName(default_props, fname, 0);
Expand Down
4 changes: 4 additions & 0 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ TEST_DATAFILES = $(datasets_dir)/large_struct_compressed_le.mat \
$(datasets_dir)/test_mcos_handle_cycle_v7.mat \
$(datasets_dir)/test_mcos_handle_cycle_v73.mat \
$(datasets_dir)/test_mcos_nested_v73.mat \
$(datasets_dir)/test_saveobj_v7.mat \
$(datasets_dir)/test_saveobj_v73.mat \
$(datasets_dir)/test_scattered_interpolant_v6.mat \
$(datasets_dir)/test_scattered_interpolant_v7.mat \
$(datasets_dir)/test_scattered_interpolant_v7.3.mat \
Expand Down Expand Up @@ -535,6 +537,8 @@ TEST_DATAFILES = $(datasets_dir)/large_struct_compressed_le.mat \
$(results_dir)/read-mcos-maps_v73-map_string_keys.out \
$(results_dir)/read-mcos-nested_v73-nested_cell.out \
$(results_dir)/read-mcos-nested_v73-struct_array.out \
$(results_dir)/read-mcos-saveobj_v7-obj_saveobj.out \
$(results_dir)/read-mcos-saveobj_v73-obj_saveobj.out \
$(results_dir)/read-mcos-scattered_interpolant_v6-F.out \
$(results_dir)/read-mcos-scattered_interpolant_v7-F.out \
$(results_dir)/read-mcos-scattered_interpolant_v73-F.out \
Expand Down
30 changes: 30 additions & 0 deletions test/results/read-mcos-saveobj_v7-obj_saveobj.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Name: obj_saveobj
Rank: 2
Dimensions: 1 x 1
Class Type: Object [TestClasses.SaveObjClass]
Data Type: Structure
Fields[1] {
Name: any
Rank: 2
Dimensions: 1 x 1
Class Type: Structure
Data Type: Structure
Fields[2] {
Name: gain
Rank: 2
Dimensions: 1 x 1
Class Type: Double Precision Array
Data Type: IEEE 754 double-precision
{
5
}
Name: name
Rank: 2
Dimensions: 1 x 5
Class Type: Character Array
Data Type: Unicode UTF-8 Encoded Character Data
{
motor
}
}
}
30 changes: 30 additions & 0 deletions test/results/read-mcos-saveobj_v73-obj_saveobj.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Name: obj_saveobj
Rank: 2
Dimensions: 1 x 1
Class Type: Object [TestClasses.SaveObjClass]
Data Type: Structure
Fields[1] {
Name: any
Rank: 2
Dimensions: 1 x 1
Class Type: Structure
Data Type: Structure
Fields[2] {
Name: gain
Rank: 2
Dimensions: 1 x 1
Class Type: Double Precision Array
Data Type: IEEE 754 double-precision
{
5
}
Name: name
Rank: 2
Dimensions: 1 x 5
Class Type: Character Array
Data Type: 16-bit, unsigned integer
{
motor
}
}
}
8 changes: 8 additions & 0 deletions test/tests/mat5_compressed_read_mcos.at
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,14 @@ AT_CHECK([cp $srcdir/results/read-mcos-maps_v7-dict_val_scalar.out expout
$builddir/test_mat readvar $srcdir/datasets/test_maps_v7.mat dict_val_scalar],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read MCOS saveobj v7 obj_saveobj])
AT_KEYWORDS([mcos])
AT_SKIP_IF([test $MCOS -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([cp $srcdir/results/read-mcos-saveobj_v7-obj_saveobj.out expout
$builddir/test_mat readvar $srcdir/datasets/test_saveobj_v7.mat obj_saveobj],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read MCOS scattered interpolant v7 F])
AT_KEYWORDS([mcos])
AT_SKIP_IF([test $MCOS -ne 1])
Expand Down
8 changes: 8 additions & 0 deletions test/tests/mat73_read_mcos.at
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ AT_CHECK([cp $srcdir/results/read-mcos-nested_v73-struct_array.out expout
$builddir/test_mat readvar $srcdir/datasets/test_mcos_nested_v73.mat struct_array],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read MCOS saveobj v73 obj_saveobj])
AT_KEYWORDS([mcos])
AT_SKIP_IF([test $MCOS -ne 1])
AT_SKIP_IF([test $MAT73 -ne 1])
AT_CHECK([cp $srcdir/results/read-mcos-saveobj_v73-obj_saveobj.out expout
$builddir/test_mat readvar $srcdir/datasets/test_saveobj_v73.mat obj_saveobj],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read MCOS scattered interpolant v73 F])
AT_KEYWORDS([mcos])
AT_SKIP_IF([test $MCOS -ne 1])
Expand Down
Loading