diff --git a/tests/testProjectConversion/DSPCBilayerProjectClass.mat b/tests/testProjectConversion/DSPCBilayerProjectClass.mat index b226877af..acc0f8068 100644 Binary files a/tests/testProjectConversion/DSPCBilayerProjectClass.mat and b/tests/testProjectConversion/DSPCBilayerProjectClass.mat differ diff --git a/tests/testProjectConversion/DSPCBilayerStructOutput.mat b/tests/testProjectConversion/DSPCBilayerStructOutput.mat index 6391c2c24..8f110be31 100644 Binary files a/tests/testProjectConversion/DSPCBilayerStructOutput.mat and b/tests/testProjectConversion/DSPCBilayerStructOutput.mat differ diff --git a/tests/testProjectConversion/DSPCBilayerStructOutputWithR1Input.mat b/tests/testProjectConversion/DSPCBilayerStructOutputWithR1Input.mat index d6357c0c2..ff1fb0d11 100644 Binary files a/tests/testProjectConversion/DSPCBilayerStructOutputWithR1Input.mat and b/tests/testProjectConversion/DSPCBilayerStructOutputWithR1Input.mat differ diff --git a/utilities/misc/r1ToProjectClass.m b/utilities/misc/r1ToProjectClass.m index 423c303e8..dff92fa46 100644 --- a/utilities/misc/r1ToProjectClass.m +++ b/utilities/misc/r1ToProjectClass.m @@ -103,6 +103,8 @@ % Remove defaults project.removeBackgroundParam(1); project.removeBackground(1); +project.removeResolutionParam(1); +project.removeResolution(1); project.removeBulkIn(1); project.removeBulkOut(1); project.removeScalefactor(1); @@ -124,6 +126,23 @@ backParamNames{i}); end +% Set resolutions +resolParamNames = num2cell(arrayfun(@(i) sprintf("Resolution par %d", i), 1:problem.numberOfResolutions)); +problem.resolution_constr = fixConstrs(problem.numberOfResolutions, resolParamNames, problem.resolution_constr, problem.resolution, problem.resolution_fityesno); +for i = 1:problem.numberOfResolutions + % Add resolutions parameter + % addResolutionParam <- (name, min, value, max, fit) + project.addResolutionParam(resolParamNames{i}, ... + problem.resolution_constr(i,1), ... + problem.resolution(i), ... + problem.resolution_constr(i,2), ... + logical(problem.resolution_fityesno(i))); + % Add resolution + project.addResolution(problem.resolNames{i}, ... + allowedTypes.Constant.value, ... + resolParamNames{i}); +end + % Set bulk in params problem.nbairs_constr = fixConstrs(problem.numberOfNbas, problem.nbaNames, problem.nbairs_constr, problem.nba, problem.nbairs_fityesno); for i = 1:problem.numberOfNbas