update overwrite logic

bachlab · Sep 7, 2023 · 10e7db6 · 10e7db6
1 parent ccbf3c8
commit 10e7db6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/pspm_overwrite.m b/src/pspm_overwrite.m
@@ -82,12 +82,12 @@
         overwrite_final = overwrite;
       case 'struct'
         overwrite_struct = overwrite;
-        if isfield(overwrite_struct, 'overwrite')
-          overwrite_final = overwrite_struct.overwrite;
+        if ~exist(fn, 'file')
+          % if file does not exist, always **overwrite**
+          overwrite_final = 1;
         else
-          if ~exist(fn, 'file')
-            % if file does not exist, always **overwrite**
-            overwrite_final = 1;
+          if isfield(overwrite_struct, 'overwrite')
+            overwrite_final = overwrite_struct.overwrite;
           else
             overwrite_final = 0;
           end

diff --git a/test/pspm_load1_test.m b/test/pspm_load1_test.m
@@ -52,7 +52,9 @@ function generate_testdata(this)
           this.modelfiles{i} = mfn;
           this.dummyfiles{i} = dfn;
           fh = str2func(['pspm_', settings.first{i}]);
-          fh(model);
+          options = struct();
+          options.overwrite = 1;
+          fh(model, options);
           copyfile(this.modelfiles{i}, this.dummyfiles{i});
         end
       end