State independent Jacobians are not matrices instead of function handles

Steven-Roberts · Steven-Roberts · commit 04a84ee154e5 · 2021-05-22T10:59:27.000-04:00
diff --git a/src/+otp/+bouncingball/BouncingBallProblem.m b/src/+otp/+bouncingball/BouncingBallProblem.m
@@ -12,7 +12,7 @@ function onSettingsChanged(obj)
             slope = obj.Parameters.groundSlope;
             
             obj.Rhs = otp.Rhs(@(t, y) otp.bouncingball.f(t, y, g, ground, slope), ...
-                otp.Rhs.FieldNames.Jacobian, @(t, y) otp.bouncingball.jac(t, y, g, ground, slope), ...
+                otp.Rhs.FieldNames.Jacobian, otp.bouncingball.jac(g, ground, slope), ...
                 otp.Rhs.FieldNames.Events, @(t, y) otp.bouncingball.events(t, y, g, ground, slope), ...
                 otp.Rhs.FieldNames.OnEvent, @otp.bouncingball.onevent);
         end
diff --git a/src/+otp/+bouncingball/jac.m b/src/+otp/+bouncingball/jac.m
@@ -1,4 +1,4 @@
-function J = jac(~, ~, ~, ~, ~)
+function J = jac(~, ~, ~)
 
 J = [0, 0, 1, 0; 0, 0, 0, 1; 0, 0, 0, 0; 0, 0, 0, 0];
 
diff --git a/src/+otp/+brusselator/BrusselatorProblem.m b/src/+otp/+brusselator/BrusselatorProblem.m
@@ -42,7 +42,7 @@ function onSettingsChanged(obj)
                 otp.Rhs.FieldNames.JacobianAdjointVectorProduct, @(t, y, x) otp.brusselator.javp(t, y, x, a, b));
             
             obj.RhsLinear = otp.Rhs(@(t, y) otp.brusselator.flinear(t, y, a, b), ...
-                otp.Rhs.FieldNames.Jacobian, @(t, y) otp.brusselator.jaclinear(t, y, a, b));
+                otp.Rhs.FieldNames.Jacobian, otp.brusselator.jaclinear(a, b));
             
             obj.RhsNonlinear = otp.Rhs(@(t, y) otp.brusselator.fnonlinear(t, y, a, b), ...
                 otp.Rhs.FieldNames.Jacobian, @(t, y) otp.brusselator.jacnonlinear(t, y, a, b));
diff --git a/src/+otp/+brusselator/jaclinear.m b/src/+otp/+brusselator/jaclinear.m
@@ -1,4 +1,4 @@
-function jac = jaclinear(~, ~, ~, b)
+function jac = jaclinear(~, b)
 
 jac = [-1 - b, 0; b, 0];
 
diff --git a/src/+otp/+cusp/CUSPProblem.m b/src/+otp/+cusp/CUSPProblem.m
@@ -38,7 +38,7 @@ function onSettingsChanged(obj)
                 otp.Rhs.FieldNames.Jacobian, @(t, y) otp.cusp.jacnonstiff(t, y, epsilon, L));
               
             obj.RhsDiffusion = otp.Rhs(@(t, y) otp.cusp.fdiffusion(t, y, epsilon, L), ...
-                otp.Rhs.FieldNames.Jacobian, @(t, y) otp.cusp.jacdiffusion(t, y, epsilon, L));
+                otp.Rhs.FieldNames.Jacobian, otp.cusp.jacdiffusion(epsilon, L));
               
             obj.RhsReaction = otp.Rhs(@(t, y) otp.cusp.freaction(t, y, epsilon, L), ...
                 otp.Rhs.FieldNames.Jacobian, @(t, y) otp.cusp.jacreaction(t, y, epsilon, L));
diff --git a/src/+otp/+cusp/jacdiffusion.m b/src/+otp/+cusp/jacdiffusion.m
@@ -1,4 +1,4 @@
-function j = jacdiffusion(~, ~, ~, L)
+function j = jacdiffusion(~, L)
 
 j = blkdiag(L, L, L);
 
diff --git a/src/+otp/+linear/LinearProblem.m b/src/+otp/+linear/LinearProblem.m
@@ -27,7 +27,7 @@
         
         function rhs = createRhs(~, A)
             rhs = otp.Rhs(@(~, y) A * y, ...
-                otp.Rhs.FieldNames.Jacobian, @(~, ~) A, ...
+                otp.Rhs.FieldNames.Jacobian, A, ...
                 otp.Rhs.FieldNames.JacobianVectorProduct, @(~, ~, v) A * v, ...
                 otp.Rhs.FieldNames.JacobianAdjointVectorProduct, @(~, ~, v) A' * v);
         end
diff --git a/src/+otp/+protherorobinson/ProtheroRobinsonProblem.m b/src/+otp/+protherorobinson/ProtheroRobinsonProblem.m
@@ -12,7 +12,7 @@ function onSettingsChanged(obj)
             dphi = obj.Parameters.dphi;
             
             obj.Rhs = otp.Rhs(@(t, y) otp.protherorobinson.f(t, y, lambda, phi, dphi), ...
-                otp.Rhs.FieldNames.Jacobian, @(t, y) otp.protherorobinson.jac(t, y, lambda, phi, dphi));
+                otp.Rhs.FieldNames.Jacobian, otp.protherorobinson.jac(lambda, phi, dphi));
         end
         
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
diff --git a/src/+otp/+protherorobinson/jac.m b/src/+otp/+protherorobinson/jac.m
@@ -1,4 +1,4 @@
-function j = jac(~, ~, lambda, ~, ~)
+function j = jac(lambda, ~, ~)
 
 j = lambda;
 
diff --git a/src/+otp/+vanderpol/VanderpolProblem.m b/src/+otp/+vanderpol/VanderpolProblem.m
@@ -21,7 +21,7 @@ function onSettingsChanged(obj)
                 otp.Rhs.FieldNames.Jacobian, @(t, y) otp.vanderpol.jacstiff(t, y, epsilon));
             
             obj.RhsNonstiff = otp.Rhs(@(t, y) otp.vanderpol.fnonstiff(t, y, epsilon), ...
-                otp.Rhs.FieldNames.Jacobian, @(t, y) otp.vanderpol.jacnonstiff(t, y, epsilon));
+                otp.Rhs.FieldNames.Jacobian, otp.vanderpol.jacnonstiff(epsilon));
         end
         
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
diff --git a/src/+otp/+vanderpol/jacnonstiff.m b/src/+otp/+vanderpol/jacnonstiff.m
@@ -1,4 +1,4 @@
-function J = jacnonstiff(~, ~, ~)
+function J = jacnonstiff(~)
 
 J = [0, 1; 0, 0];
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function J = jac(~, ~, ~, ~, ~)`
	`1`	`+function J = jac(~, ~, ~)`
`2`	`2`
`3`	`3`	`J = [0, 0, 1, 0; 0, 0, 0, 1; 0, 0, 0, 0; 0, 0, 0, 0];`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function jac = jaclinear(~, ~, ~, b)`
	`1`	`+function jac = jaclinear(~, b)`
`2`	`2`
`3`	`3`	`jac = [-1 - b, 0; b, 0];`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function j = jacdiffusion(~, ~, ~, L)`
	`1`	`+function j = jacdiffusion(~, L)`
`2`	`2`
`3`	`3`	`j = blkdiag(L, L, L);`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function j = jac(~, ~, lambda, ~, ~)`
	`1`	`+function j = jac(lambda, ~, ~)`
`2`	`2`
`3`	`3`	`j = lambda;`
`4`	`4`