Add IDs to validation warnings

Author: Steven-Roberts

src/+otp/+allencahn/AllenCahnProblem.m

@@ -9,11 +9,15 @@
 
     methods (Access = protected)
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
+            [email protected](obj, newTimeSpan, newY0, ...
+                newParameters);
+            
             y0Len = length(newY0);
             gridPts = newParameters.Size^2;
 
             if y0Len ~= gridPts
-                warning('Y0 has size %d, but there are %d grid points', ...
+                warning('OTP:inconsistentNumVars', ...
+                    'NumVars is %d, but there are %d grid points', ...
                     y0Len, gridPts);
             end
         end

src/+otp/+cusp/CUSPProblem.m

@@ -20,11 +20,15 @@
 
     methods (Access = protected)
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
+            [email protected](obj, newTimeSpan, newY0, ...
+                newParameters);
+            
             y0Len = length(newY0);
             gridPts = 3 * newParameters.Size;
 
             if y0Len ~= gridPts
-                warning('Y0 has size %d, but there are %d grid points', ...
+                warning('OTP:inconsistentNumVars', ...
+                    'NumVars is %d, but there are %d grid points', ...
                     y0Len, gridPts);
             end
         end

src/+otp/+nbody/NBodyProblem.m

@@ -7,13 +7,16 @@
 
     methods (Access = protected)
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
+            [email protected](obj, newTimeSpan, newY0, ...
+                newParameters);
+            
             numMasses = length(newParameters.Masses);
             expectedLen = numMasses * 2^newParameters.SpatialDim;
             actualLen = length(newY0);
 
             if expectedLen ~= actualLen
-                warning( ...
-                    'With %d masses, Y0 should have length %d but has %d', ...
+                warning('OTP:inconsistentNumVars', ...
+                    'With %d masses, NumVars should be %d but is %d', ...
                     numMasses, expectedLen, actualLen);
             end
         end

src/+otp/+pendulum/PendulumProblem.m

@@ -25,17 +25,21 @@
 
     methods (Access = protected)
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
+            [email protected](obj, newTimeSpan, newY0, ...
+                newParameters);
+            
             y0Len = length(newY0);
             numMasses = length(newParameters.Masses);
             numLens = length(newParameters.Lengths);
 
             if y0Len ~= 2 * numMasses
-                warning( ...
-                    'With %d masses, Y0 should have length %d but has %d', ...
+                warning('OTP:inconsistentNumVars', ...
+                    'With %d masses, NumVars should be %d but is %d', ...
                     numMasses, 2 * numMasses, y0Len);
-            elseif numMasses ~= numLens
-                warning('Masses has length %d, but Lengths has length %d', ...
-                    numMasses, numLens);
+            elseif y0Len ~= 2 * numLens
+                warning('OTP:inconsistentNumVars', ...
+                    'With %d lengths, NumVars should be %d but is %d', ...
+                    numLens, 2 * numLens, y0Len);
             end
         end
 

src/+otp/+qg/QuasiGeostrophicProblem.m

@@ -101,11 +101,15 @@
 
     methods (Access = protected)
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
+            [email protected](obj, newTimeSpan, newY0, ...
+                newParameters);
+            
             y0Len = length(newY0);
             gridPts = newParameters.Nx * newParameters.Ny;
 
             if y0Len ~= gridPts
-                warning('Y0 has size %d, but there are %d grid points', ...
+                warning('OTP:inconsistentNumVars', ...
+                    'NumVars is %d, but there are %d grid points', ...
                     y0Len, gridPts);
             end
         end

src/+otp/Problem.m

@@ -29,6 +29,8 @@
             end
             obj.Name = name;
             obj.ExpectedNumVars = expectedNumVars;
+            
+            % IDEA: Make Settings a class with property validation
             obj.Settings = struct('timeSpan', timeSpan(:), 'y0', y0, 'parameters', parameters);
         end