From 1104032e019af01da2a2251dff655addaf5b3448 Mon Sep 17 00:00:00 2001
From: Tom Teasdale <teasdale@lightsaber.red>
Date: Sun, 21 Jan 2024 15:02:23 +0100
Subject: [PATCH] added range checks

Input arguments are checked for being within valid range as defined per parameters or loose fallbacks if ranges are undefined.
---
 +tests/FunctionSignatures.mlx   | Bin 3664 -> 3661 bytes
 src/+magicformula/InputParser.m |  40 +++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/+tests/FunctionSignatures.mlx b/+tests/FunctionSignatures.mlx
index 4e286d7487fb2a901056db57ae1be4c7f8a626d5..80e645e1f1f5f4a645c8b440bf238f7e61000db0 100644
GIT binary patch
delta 1251
zcmV<91RVR&9L*fC#R3XDV!)?S0ssI32b0eNC4WK*QksOWt18|qv<-<$+t9)gYSj<M
zaUh-ZBKrd6-|rltfCwEz+ZV^Vd!FacXZzf~e@z5gaH--f?U)VMHwjN!7RKqUWBwZT
zukOtIZhP4bGgc%#1%migHJ2T84v;rJPq8^qsB*KMr|63^nNYxAIrEm840D+=t`y28
z!hgH={aY`gacXMGX%?>ZH!p{wEI$FP1SiYpf{Km_F$ivY+VR4+M!_S{Ht&s84$vKO
z1*Bi33~((Zh-WE<LUN^%P~zp9^?uMfr+W2ghaGbnM=O%hS<HxDejzBqrT<oB8N-}V
zAxN~%N?n>2ZV9gp-~RCQ`Acuqdx~O2cYlb5JLU0Ln&g5j4}f{uG%6IMz(W^eX|)U^
z=piuVvujC1`(wRj1QRq|`R+~Acl`zqH!WkZ5AqQ-7^1;<@4kL&8U06`H*h~&##nP3
zI5A))bq3#bCHm_^jL>9Ti`#~U0%eId6|yzh2_{a^tG`3tH;mV()J3(+#4hEbPk*~y
zk<oB8_-X4(U#7HS=2X%|A)u5U>OT&+I`p7Xfh-u<Yminu2&5(60v&kPglgYGdWWoC
z)>U?=|9FCd9%nFg2B#Fy_B-Rr84$-m2XwT<l}gU>NvOtEp4@8a$&>p0-2LlaSDe96
z?p^Qy)}|hUAKyvYDi}@4loN?M|4F<T)ySqBMTHQ0YFkP&%OTdb6Ykox`=YW`7rBPH
zs6qhJFiad`$Lb%Ub^hCHR3lU=F2Rl!PjXn<Yks|6U2<>x<aoR1tosMEJOzRR1iD2h
zmXpE<DStsr!!Q_z@B0-Y_clpeWQ4XmC_5<#Rupd`{niDWG$he(|K6-_b<Tm1OL(8}
z;Y;3fwbMQN1n1RYD$G)f5g0kN%5)WeZq~^XBOiomML!s*@E$xyt9nsN%jMwU(G3<{
zP~cHC8PBDy@HPa?3Gs3ZTKF^)CWf2AX%XVpb$`SP`7Syj8KpNwLlCV9f*gd2osIaY
zY~`%9AFiJStt8Nc1`|ACDI-6uR$*`9>clBLqXRhYufkI@lRK|wY8=OO%qK4H&&cb;
z{nPZ+M47{1Nx=02q4H?w(t!xjqUhk?yPcAk{PwO{<2s{Ro=}$1Ws^}}FiwlNl3dLH
zav$ng(MJ6zEe_I*H7w`FGM+Q(Nf4_ff4Zy}Ur<W}1d~e*8k2Jk9kV|P$^j0L2n)5r
z0000t0RR9f0F!YI8<Q&z4}W!zI}d_D5QKYv#Y%tN3k@dc+1c5sXlW2uA;=?lX#Dwd
zBE-gS_M6$+RqI!EhbJ0aH1*2o0rLUtw8@J4w({e{hD82adum1q9ETJX^|dio(mCBL
z*d|?mYD{TiCzy~I*x?-$i$F-fIl1TWm9yK|9)S7+Eo2}976=(J&O)T3BX=1ybm^g5
z(Q$TOhBh@t>mJc@n<X6rSM-;DQa#suY=LudC4IsXXQer&rF~R7<jc7X<zg8rIzdm-
zf6u=GlL8Ei3Oi!Jr%?g`009S+mJCq=Ig{uNBm}xeCzg{C4Hg2e2b0VP9g~m^5R+96
z8UX>5a1BZV3JQ~P4I7i!4ILbi2n)5r0000t0RR9f0000000001000000Qd@%aSa=j
ND-It9{|f*B0060$Hc<co

delta 1260
zcmV<I1QYws9MBxF#R3Xx001*o0ssL129wVMC4Z_Cq%;X#S5;7`&^9C{Z9@w~RjYn*
z9S7VwFS0LC{{7BLDWHZHq3w&~+&#~8=d*pjx_(L}S#YIAp7rduAKHXxERRJt>)F32
z!_!Oqx_`Co#5pTdo&iC8raQ}?JqIW{L7>^3r&RlS!87zFxk@SEubKtRT*ZaT8P^)+
zQhynoh2cezQjyt4@*$5`=37+5SXG}0R+5utXF+Ap1_6@WfpI*twNdf}j4gN}RRi=V
zTmu=F83SAkiNq|UP%5qs5-Pl^S#JlOb81$9aM&qVB3Y4?&IBW7`K6=;m;OhSrGPo1
zQj%nyl|D8r+!Edx{_4Zs=P!fF;4Tq}?tc*ncPijdG%Y080RRi~hosbu0*`$V%IR8G
zG(cd?XJ?AW?#EWwif+(w8v5s*&=1=<oOi9!HYh~UXpDx?zx?{CYYlI4-p2jxT2sSq
z<HUlMG8ud~l^E8An4rmZ78h*?1*#G~SI9MBFS_xfLF*0bwqaVIQXkch6FZiNK7Zr#
zWlrPC=$C6MeVo!Wv!IHm8UdB;*!*$8)u9KC8dS-^twBa@Cy<eN3AE#>3C+Hp^mbXB
ztefoK@OBRaJ>F=aT<!Em<M;gD^yUDF7ajt7wY`l>-s@w~jB7l$&CtEa^!~p8?nT#}
z!B}nG?f=%JzC}NOkg88Gnvn-i6j18?^G0++o?B5;N@=F9qZM;J;;h@?rZ@YKI?qgz
zPcRo<N<bQh5iz!_;VZPse|?8e2-TV^aE0b+0V}uWw_43557zHZuzAb+e*sWS0|b-6
z3>vdn1!MvQFZEHrlfMTkf6+?AFcgOG`xGJfZIW(`8QShb*_DD|Me#1AXIrpILlW)w
z_GWdhn-07T|93u4&R?wdx<#Mhyy{GeSw=AeBfCbKZHb@jb-KjJ2Vok~b_Pm(0FTkC
zN(yPY>>ND0&VmaHJc=gcxwIwTg<v@$UhY5(pGCsNaML+0LVUU{f3ZToi!G3x(go2F
zL?ePAM`3CwBR(k`IVtUjYX?Ci3ACWW1W#DT$PcSkI9RwkF@|S!0H^&`ct|F4@6|;0
zeV_HSfs6Yy^7?T9G<-Ex=6EX!xJnQzPIfLGhyV?W4*tE{n7qtx@9H(Ka+=Rl%2K+l
zbIRw8)A?ILe$8Jv8+EK`qyCq&Jk4)vw&0XS@0oNI#45?3F014VvjGVO0tu6_ejUL8
z001_V4+}AWF%N<;5QTSs#o4`-7EwrQ+1zw6q9Z}5(g@VFX#Dw7QR3qE?tAav9Z#Qa
z0}pAe(%lMCKR_V6Qdg?GtWdUJ;~1sF<1>umFs49tXKmV|cY08;Df;@T&DFw=1uQ(l
zPByZz5-=V%CpZ6G$=$y20Qd(87W&K&d^V2~nk1Y+e7Vb*u}h5AoP1~JRnnG5-P|K0
zyH!OmA>!nhzEcAiTm1kQgDV*ljyS8VWqGytR>Vs>r(sMNoJ`E)<lpZvlm82f3TXfU
zGgJZq0R9G(lMGP-Jd@=NBpfgGQN9}i000>R000{R000000003100000um_XL2OX1*
z4G@!34H^LilWh%30u2h2ZVelg)D0aRldygr!2kdNHUR(tC;$Ke000000RR91008?6
WlWq+glP?PolQ#|!1_BHK0001)Ts)}&

diff --git a/src/+magicformula/InputParser.m b/src/+magicformula/InputParser.m
index e143ac4..598ad66 100644
--- a/src/+magicformula/InputParser.m
+++ b/src/+magicformula/InputParser.m
@@ -3,9 +3,10 @@
     methods (Static)
         function [p,SX,SA,FZ,IP,IA,VX,side,ver] = parse(p,SX,SA,varargin)
             versions = enumeration('MagicFormulaVersion');
-            isValidVersion = @(x) mustBeMember(x, versions);
-            isValidNumericVector = @(x) isnumeric(x) && isvector(x);
-            isValidTyreSide = @(x) mustBeMember(x, [0, 1]);
+            isVersion = @(x) mustBeMember(x, versions);
+            isVector = @(x) isnumeric(x) && isvector(x);
+            isTyreSide = @(x) mustBeMember(x, [0, 1]);
+            isWithinBounds = @(x,lb,ub) isVector(x) && all(x>lb & x<ub);
 
             getNonempty = @magicformula.InputParser.getNonempty;
             p    = magicformula.InputParser.parseParams(p);
@@ -17,15 +18,32 @@
             ver  = MagicFormulaVersion.fromFITTYP(p.FITTYP);
             ver  = getNonempty(ver,versions(1));
 
+            FZMAX = getNonempty(p.FZMAX, inf);
+            FZMIN = getNonempty(p.FZMIN, eps);
+            KPUMAX = getNonempty(p.KPUMAX, +1);
+            KPUMIN = getNonempty(p.KPUMIN, -1);
+            PRESMAX = getNonempty(p.PRESMAX, inf);
+            PRESMIN = getNonempty(p.PRESMIN, eps);
+            ALPMAX = getNonempty(p.ALPMAX, +pi);
+            ALPMIN = getNonempty(p.ALPMIN, -pi);
+            CAMMAX = getNonempty(p.CAMMAX, +pi/2);
+            CAMMIN = getNonempty(p.CAMMIN, -pi/2);
+
+            isValidFZ = @(FZ) isWithinBounds(FZ, FZMIN, FZMAX);
+            isValidIP = @(IP) isWithinBounds(IP, PRESMIN, PRESMAX);
+            isValidSX = @(SX) isWithinBounds(SX, KPUMIN, KPUMAX);
+            isValidSA = @(SA) isWithinBounds(SA, ALPMIN, ALPMAX);
+            isValidIA = @(IA) isWithinBounds(IA, CAMMIN, CAMMAX);
+
             parser = inputParser();
-            parser.addRequired('SX',isValidNumericVector);
-            parser.addRequired('SA',isValidNumericVector);
-            parser.addOptional('FZ',FZ,isValidNumericVector);
-            parser.addOptional('IP',IP,isValidNumericVector);
-            parser.addOptional('IA',IA,isValidNumericVector);
-            parser.addOptional('VX',VX,isValidNumericVector);
-            parser.addOptional('side',side,isValidTyreSide);
-            parser.addOptional('version',ver,isValidVersion);
+            parser.addRequired('SX', isValidSX);
+            parser.addRequired('SA', isValidSA);
+            parser.addOptional('FZ', FZ, isValidFZ);
+            parser.addOptional('IP', IP, isValidIP);
+            parser.addOptional('IA', IA, isValidIA);
+            parser.addOptional('VX', VX, isVector);
+            parser.addOptional('side', side, isTyreSide);
+            parser.addOptional('version', ver, isVersion);
             parser.parse(SX, SA, varargin{:});
 
             results = parser.Results;