Merge branch 'fix_sparse_matrix_write' into 'develop'

fix sparse matrix write

See merge request devel/gams-transfer-matlab!82

Author: renkekuhlmann

+gams/+transfer/+gdx/gt_gdx_write.cpp

@@ -493,6 +493,8 @@ void mexFunction(
                 {
                     for (size_t k = 0; k < sizes[1]; k++)
                     {
+                        bool is_default_rec = true;
+
                         /* set domains */
                         if (dim >= 1)
                             gdx_uel_index[0] = domain_uel_ids[0][j];
@@ -507,13 +509,16 @@ void mexFunction(
                                 continue;
                             idx = mx_cols[kk][k] + col_nnz[kk][k];
                             if (idx >= mx_cols[kk][k+1] || mx_rows[kk][idx] != j)
-                            {
                                 gdx_values[kk] = 0;
-                                continue;
+                            else
+                            {
+                                col_nnz[kk][k]++;
+                                gdx_values[kk] = gt_utils_sv_matlab2gams(mx_values[kk][idx], eps_to_zero);
                             }
-                            col_nnz[kk][k]++;
-                            gdx_values[kk] = gt_utils_sv_matlab2gams(mx_values[kk][idx], eps_to_zero);
+                            is_default_rec = (gdx_values[kk] != def_values[kk]) ? false : is_default_rec;
                         }
+                        if (can_skip_default_recs && is_default_rec)
+                            continue;
 
                         /* write values */
                         if (issorted)

.gitlab-ci.yml

@@ -232,6 +232,7 @@ matlab:build:macos:
     stage: matlab:build
     tags:
         - macos
+        - clarus
     needs: [download:macos]
     script:
         - mkdir -p macos/matlab
@@ -252,6 +253,7 @@ matlab:build:macos_arm:
     stage: matlab:build
     tags:
         - macos-arm64
+        - stan
     needs: [download:macos_arm]
     script:
         - mkdir -p macos_arm/matlab
@@ -357,6 +359,7 @@ matlab:test:macos:
     stage: matlab:test
     tags:
         - macos
+        - clarus
     needs: [download:macos, matlab:build:macos]
     before_script:
         - PATH=$PWD/macos/gdx:$PATH
@@ -379,6 +382,7 @@ matlab:test:macos_arm:
     stage: matlab:test
     tags:
         - macos-arm64
+        - stan
     needs: [download:macos_arm, matlab:build:macos_arm]
     before_script:
         - PATH=$PWD/macos_arm/gdx:$PATH
@@ -426,14 +430,14 @@ package:
     image:
         name: $CI_REGISTRY_IMAGE/linux/builder
     script:
-        - cd linux/matlab
-        - sudo zip -r gams_transfer_matlab_linux.zip +gams
-        - cd ../../macos/matlab
-        - sudo zip -r gams_transfer_matlab_macos.zip +gams
-        - cd ../../macos_arm/matlab
-        - sudo zip -r gams_transfer_matlab_macos_arm.zip +gams
-        - cd ../../windows/matlab
-        - sudo zip -r gams_transfer_matlab_windows.zip +gams
+        - |
+            for d in linux macos macos_arm windows
+            do
+                cd $d/matlab
+                sudo zip -r gams_transfer_matlab_$d.zip +gams
+                cd ../..
+                mv $d/matlab/gams_transfer_matlab_$d.zip .
+            done
     artifacts:
         name: release
         paths:

CHANGELOG.md

@@ -1,3 +1,7 @@
+GAMS Transfer Matlab v1.0.3
+==================
+- Fixed sparse write of format `sparse_matrix`.
+
 GAMS Transfer Matlab v1.0.2
 ==================
 - Fixed GDX setup.

test/test_readwrite.m

@@ -38,6 +38,7 @@
     test_readWriteCompress(t, cfg);
     test_readWriteDomainCheck(t, cfg);
     test_writeEpsToZero(t, cfg);
+    test_writeSparse(t, cfg);
     [~, n_fails1] = t.summary();
 
     t = GAMSTest('readwrite_rc');
@@ -1738,3 +1739,28 @@ function test_writeEpsToZero(t, cfg)
     t.assert(gams.transfer.SpecialValues.isEps(gdx.data.e.records.scale));
 
 end
+
+function test_writeSparse(t, cfg)
+
+    gdx = gams.transfer.Container();
+    i = gams.transfer.Set(gdx, 'i', '*', 'records', {'i1', 'i2', 'i3', 'i4', 'i5', 'i6', 'i7', 'i8', 'i9', 'i10'});
+    gams.transfer.Parameter(gdx, 'p', i, 'records', {{'i2', 'i6'}, [2 6]});
+
+    t.add('write_sparse_sparse_matrix');
+    gdx.data.p.transformRecords('sparse_matrix');
+    gdx.write('test.gdx');
+    t.assert(~system(sprintf('gdxdump %s Symbols | grep -q "p *1 *Par *2"', 'test.gdx')));
+
+    t.add('write_sparse_struct');
+    gdx.data.p.transformRecords('struct');
+    gdx.write('test.gdx');
+    t.assert(~system(sprintf('gdxdump %s Symbols | grep -q "p *1 *Par *2"', 'test.gdx')));
+
+    if gams.transfer.Constants.SUPPORTS_TABLE
+        t.add('write_sparse_table');
+        gdx.data.p.transformRecords('table');
+        gdx.write('test.gdx');
+        t.assert(~system(sprintf('gdxdump %s Symbols | grep -q "p *1 *Par *2"', 'test.gdx')));
+    end
+
+end