RascalSoftware · DrPaulSharp · Aug 21, 2024 · Aug 19, 2024 · Aug 19, 2024 · Aug 19, 2024
diff --git a/examples/domains/customLayers/domainsCustomLayerSheet.mlx b/examples/domains/customLayers/domainsCustomLayerSheet.mlx
diff --git a/examples/validation/bayes/README.md → ...es/miscellaneous/bayesBenchmark/README.md b/examples/validation/bayes/README.md → ...es/miscellaneous/bayesBenchmark/README.md
diff --git a/examples/miscellaneous/bayesBenchmark/bayesBenchmark.mlx b/examples/miscellaneous/bayesBenchmark/bayesBenchmark.mlx
diff --git a/examples/validation/bayes/defaultProject.mat → ...laneous/bayesBenchmark/defaultProject.mat b/examples/validation/bayes/defaultProject.mat → ...laneous/bayesBenchmark/defaultProject.mat
diff --git a/examples/validation/bayes/directCompare2D.m → ...llaneous/bayesBenchmark/directCompare2D.m b/examples/validation/bayes/directCompare2D.m → ...llaneous/bayesBenchmark/directCompare2D.m
diff --git a/examples/validation/bayes/directCompare3D.m → ...llaneous/bayesBenchmark/directCompare3D.m b/examples/validation/bayes/directCompare3D.m → ...llaneous/bayesBenchmark/directCompare3D.m
diff --git a/examples/validation/bayes/getFitValues.m → ...scellaneous/bayesBenchmark/getFitValues.m b/examples/validation/bayes/getFitValues.m → ...scellaneous/bayesBenchmark/getFitValues.m
diff --git a/examples/miscellaneous/roundRobin/roundRobin.mlx b/examples/miscellaneous/roundRobin/roundRobin.mlx
diff --git a/examples/normalReflectivity/customLayers/customLayersDSPCSheet.mlx b/examples/normalReflectivity/customLayers/customLayersDSPCSheet.mlx
diff --git a/examples/normalReflectivity/customXY/customXYDSPCSheet.mlx b/examples/normalReflectivity/customXY/customXYDSPCSheet.mlx
diff --git a/examples/validation/ORSO/orsoTest0.m b/examples/validation/ORSO/orsoTest0.m
diff --git a/examples/validation/ORSO/orsoTest1.m b/examples/validation/ORSO/orsoTest1.m
diff --git a/examples/validation/ORSO/orsoTest2.m b/examples/validation/ORSO/orsoTest2.m
diff --git a/examples/validation/ORSO/orsoTest3.m b/examples/validation/ORSO/orsoTest3.m
diff --git a/examples/validation/ORSO/orsoTest6.m b/examples/validation/ORSO/orsoTest6.m
diff --git a/examples/validation/ORSO/orsoTest7.m b/examples/validation/ORSO/orsoTest7.m
diff --git a/examples/validation/ORSO/validateMain.m b/examples/validation/ORSO/validateMain.m
diff --git a/examples/validation/README.md b/examples/validation/README.md
diff --git a/examples/validation/bayes/bayesBenchmark.mlx b/examples/validation/bayes/bayesBenchmark.mlx
diff --git a/examples/validation/ORSO/orsoTest4.m → tests/ORSO/orsoTest4.m b/examples/validation/ORSO/orsoTest4.m → tests/ORSO/orsoTest4.m
@@ -1,4 +1,4 @@
-function out = orsoTest3()
+function out = orsoTest4()
 % ORSO validation Test4 - Reflectivity plus resolution...
 
 layers = dlmread('test0.layers');

diff --git a/examples/validation/ORSO/orsoTest5.m → tests/ORSO/orsoTest5.m b/examples/validation/ORSO/orsoTest5.m → tests/ORSO/orsoTest5.m
diff --git a/examples/validation/ORSO/test0.dat → tests/ORSO/test0.dat b/examples/validation/ORSO/test0.dat → tests/ORSO/test0.dat
diff --git a/examples/validation/ORSO/test0.layers → tests/ORSO/test0.layers b/examples/validation/ORSO/test0.layers → tests/ORSO/test0.layers
diff --git a/examples/validation/ORSO/test1.dat → tests/ORSO/test1.dat b/examples/validation/ORSO/test1.dat → tests/ORSO/test1.dat
diff --git a/examples/validation/ORSO/test1.layers → tests/ORSO/test1.layers b/examples/validation/ORSO/test1.layers → tests/ORSO/test1.layers
diff --git a/examples/validation/ORSO/test2.dat → tests/ORSO/test2.dat b/examples/validation/ORSO/test2.dat → tests/ORSO/test2.dat
diff --git a/examples/validation/ORSO/test2.layers → tests/ORSO/test2.layers b/examples/validation/ORSO/test2.layers → tests/ORSO/test2.layers
@@ -1,2 +1,3 @@
 0.0000	0.0000	0.0000	0.0000
+0.0000	0.0000	0.0000	0.0000
 0.0000	6.3600	0.0000	3.0000
diff --git a/examples/validation/ORSO/test3.dat → tests/ORSO/test3.dat b/examples/validation/ORSO/test3.dat → tests/ORSO/test3.dat
diff --git a/examples/validation/ORSO/test3.layers → tests/ORSO/test3.layers b/examples/validation/ORSO/test3.layers → tests/ORSO/test3.layers
diff --git a/examples/validation/ORSO/test4.dat → tests/ORSO/test4.dat b/examples/validation/ORSO/test4.dat → tests/ORSO/test4.dat
diff --git a/examples/validation/ORSO/test5.dat → tests/ORSO/test5.dat b/examples/validation/ORSO/test5.dat → tests/ORSO/test5.dat
diff --git a/examples/validation/ORSO/test6.dat → tests/ORSO/test6.dat b/examples/validation/ORSO/test6.dat → tests/ORSO/test6.dat
diff --git a/examples/validation/ORSO/test6.layers → tests/ORSO/test6.layers b/examples/validation/ORSO/test6.layers → tests/ORSO/test6.layers
diff --git a/examples/validation/ORSO/test7.dat → tests/ORSO/test7.dat b/examples/validation/ORSO/test7.dat → tests/ORSO/test7.dat
diff --git a/examples/validation/ORSO/test7.layers → tests/ORSO/test7.layers b/examples/validation/ORSO/test7.layers → tests/ORSO/test7.layers
diff --git a/tests/ORSO/testORSOValidation.m b/tests/ORSO/testORSOValidation.m
@@ -0,0 +1,61 @@
+classdef testORSOValidation < matlab.unittest.TestCase
+%%
+% Runs ORSO Validations.
+% (For now, we exclude test 4 and test 5, as these test resolution
+% functions which will diverge until phase 2 of the resolution calculations
+% is implemented)
+
+    properties
+        orsoTolerance = 1.0e-10;
+    end
+
+    properties (TestParameter)
+        layersFile = {'test0.layers', 'test1.layers', 'test2.layers', 'test3.layers', 'test6.layers', 'test7.layers'}
+        dataFile = {'test0.dat', 'test1.dat', 'test2.dat', 'test3.dat', 'test6.dat', 'test7.dat'}
+        % layersFile = {'test0.layers', 'test1.layers', 'test2.layers', 'test3.layers', 'test0.layers', 'test1.layers', 'test6.layers', 'test7.layers'}
+        % dataFile = {'test0.dat', 'test1.dat', 'test2.dat', 'test3.dat', 'test4.dat', 'test5.dat', 'test6.dat', 'test7.dat'}
+    end
+
+    methods (Test, ParameterCombination='sequential')
+
+        function testORSO(testCase, layersFile, dataFile)
+            testCase.verifyLessThanOrEqual(testORSOValidation.orsoTest(layersFile, dataFile), testCase.orsoTolerance, 'ORSO test has failed');
+        end
+
+    end
+
+    methods (Static)
+
+        function out = orsoTest(layersFile, dataFile)
+
+            layers = dlmread(layersFile);
+
+            % Change the units to Å
+            layers(:,2) = layers(:,2) .* 1e-6;
+            layers(:,3) = layers(:,3) .* 1e-6;
+
+            % Read in the data.....
+            data = dlmread(dataFile);
+
+            % Group the Layers
+            thick = layers(:,1);
+            sld = complex(layers(:,2),layers(:,3));
+            rough = layers(:,4);
+
+            % Calculate reflectivity...
+            q = data(:,1);
+            N = size(layers,1);
+            ref = abelesSingle(q,N,thick,sld,rough);
+
+            % Plot the comparison....
+            figure(1); clf
+            semilogy(q,ref,'k-','LineWidth',2)
+            hold on
+            plot(data(:,1),data(:,2),'r.')
+
+            % Calculate the output....
+            out = sum(sum((data(:,2) - ref).^2));
+
+        end
+    end
+end
diff --git a/tests/testExamples.m b/tests/testExamples.m
@@ -13,13 +13,14 @@
                          ['domains' filesep 'customLayers'],...
                          ['domains' filesep 'customXY'],...
                          ['miscellaneous' filesep 'absorption'],...
+                         ['miscellaneous' filesep 'bayesBenchmark'],...
                          ['miscellaneous' filesep 'roundRobin'],...
                          ['miscellaneous' filesep 'convertRasCAL1Project']};
         exampleLiveScriptFile = {'domainsStandardLayersSheet', 'domainsCustomLayerSheet',... 
-                                 'domainsCustomXYSheet', 'convertRascal'}
-%         exampleLiveScriptFile = {'domainsStandardLayersSheet', 'domainsCustomLayerSheet', 'domainsCustomXYSheet',... 
-%                                  'customLayersDSPCSheet', 'standardLayersDSPCSheet', 'customXYDSPCSheet',...
-%                                  'roundRobin', 'convertRascal'}
+                                 'domainsCustomXYSheet', 'bayesBenchmark', 'convertRascal'}
+        % exampleLiveScriptFile = {'domainsStandardLayersSheet', 'domainsCustomLayerSheet', 'domainsCustomXYSheet',... 
+        %                          'customLayersDSPCSheet', 'standardLayersDSPCSheet', 'customXYDSPCSheet',...
+        %                          'roundRobin', 'bayesBenchmark', 'convertRascal'}
         exampleScriptFile = {'standardLayersDSPCScript',...
                              'customLayersDSPCScript',...
                              'orsoCustomXYDSPC',...