diff --git a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Import.hs b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Import.hs index 8fc55f54a1..17b5a984e7 100644 --- a/code/drasil-code/lib/Language/Drasil/Code/Imperative/Import.hs +++ b/code/drasil-code/lib/Language/Drasil/Code/Imperative/Import.hs @@ -40,14 +40,14 @@ import qualified Language.Drasil.Mod as M (Class(..)) import GOOL.Drasil (Label, SFile, MSBody, MSBlock, VSType, SVariable, SValue, MSStatement, MSParameter, SMethod, CSStateVar, SClass, NamedArgs, Initializers, OOProg, PermanenceSym(..), bodyStatements, BlockSym(..), - TypeSym(..), VariableSym(..), OOVariableSym(..), VariableElim(..), ($->), ValueSym(..), - Literal(..), VariableValue(..), NumericExpression(..), BooleanExpression(..), - Comparison(..), ValueExpression(..), OOValueExpression(..), - objMethodCallMixedArgs, List(..), StatementSym(..), AssignStatement(..), - DeclStatement(..), IOStatement(..), StringStatement(..), ControlStatement(..), - ifNoElse, ScopeSym(..), ParameterSym(..), MethodSym(..), OOMethodSym(..), - pubDVar, privDVar, nonInitConstructor, convTypeOO, ScopeTag(..), CodeType(..), - onStateValue) + TypeSym(..), VariableSym(..), OOVariableSym(..), staticConst, + VariableElim(..), ($->), ValueSym(..), Literal(..), VariableValue(..), + NumericExpression(..), BooleanExpression(..), Comparison(..), + ValueExpression(..), OOValueExpression(..), objMethodCallMixedArgs, List(..), + StatementSym(..), AssignStatement(..), DeclStatement(..), IOStatement(..), + StringStatement(..), ControlStatement(..), ifNoElse, ScopeSym(..), + ParameterSym(..), MethodSym(..), OOMethodSym(..), pubDVar, privDVar, + nonInitConstructor, convTypeOO, ScopeTag(..), CodeType(..), onStateValue) import qualified GOOL.Drasil as C (CodeType(List, Array)) import Prelude hiding (sin, cos, tan, log, exp) @@ -100,7 +100,7 @@ variable s t = do g <- get let cs = codeSpec g defFunc Var = var - defFunc Const = staticVar + defFunc Const = staticConst if s `elem` map codeName (inputs cs) then inputVariable (inStruct g) Var (var s t) else if s `elem` map codeName (constants $ codeSpec g) diff --git a/code/drasil-gool/lib/GOOL/Drasil.hs b/code/drasil-gool/lib/GOOL/Drasil.hs index 023375fdf0..5850248f0c 100644 --- a/code/drasil-gool/lib/GOOL/Drasil.hs +++ b/code/drasil-gool/lib/GOOL/Drasil.hs @@ -10,22 +10,23 @@ module GOOL.Drasil (Label, GSProgram, SFile, MSBody, MSBlock, VSType, extObjDecNewNoParams, IOStatement(..), StringStatement(..), FuncAppStatement(..), OOFuncAppStatement(..), CommentStatement(..), initObserverList, addObserver, ControlStatement(..), ifNoElse, switchAsIf, - VariableSym(..), OOVariableSym(..), VariableElim(..), ($->), listOf, listVar, - ValueSym(..), Argument(..), Literal(..), MathConstant(..), VariableValue(..), - OOVariableValue, CommandLineArgs(..), NumericExpression(..), - BooleanExpression(..), Comparison(..), ValueExpression(..), - OOValueExpression(..), funcApp, funcAppNamedArgs, selfFuncApp, extFuncApp, - libFuncApp, newObj, extNewObj, libNewObj, exists, objMethodCall, - objMethodCallNamedArgs, objMethodCallMixedArgs, objMethodCallNoParams, - FunctionSym(..), ($.), selfAccess, GetSet(..), List(..), listSlice, - listIndexExists, at, ObserverPattern(..), StrategyPattern(..), ScopeSym(..), - ParameterSym(..), MethodSym(..), OOMethodSym(..), privMethod, pubMethod, - initializer, nonInitConstructor, StateVarSym(..), privDVar, pubDVar, pubSVar, - ClassSym(..), ModuleSym(..), convType, convTypeOO, ProgData(..), FileData(..), - ModData(..), ScopeTag(..), CodeType(..), GOOLState(..), lensMStoVS, headers, - sources, mainMod, initialState, onStateValue, onCodeList, unCI, unPC, unJC, - unCSC, unCPPC, unSC, pyName, pyVersion, jName, jVersion, csName, csVersion, - cppName, cppVersion, swiftName, swiftVersion + VariableSym(..), OOVariableSym(..), staticVar, staticConst, VariableElim(..), + ($->), listOf, listVar, ValueSym(..), Argument(..), Literal(..), + MathConstant(..), VariableValue(..), OOVariableValue, CommandLineArgs(..), + NumericExpression(..), BooleanExpression(..), Comparison(..), + ValueExpression(..), OOValueExpression(..), funcApp, funcAppNamedArgs, + selfFuncApp, extFuncApp, libFuncApp, newObj, extNewObj, libNewObj, exists, + objMethodCall, objMethodCallNamedArgs, objMethodCallMixedArgs, + objMethodCallNoParams, FunctionSym(..), ($.), selfAccess, GetSet(..), + List(..), listSlice, listIndexExists, at, ObserverPattern(..), + StrategyPattern(..), ScopeSym(..), ParameterSym(..), MethodSym(..), + OOMethodSym(..), privMethod, pubMethod, initializer, nonInitConstructor, + StateVarSym(..), privDVar, pubDVar, pubSVar, ClassSym(..), ModuleSym(..), + convType, convTypeOO, ProgData(..), FileData(..), ModData(..), ScopeTag(..), + CodeType(..), GOOLState(..), lensMStoVS, headers, sources, mainMod, + initialState, onStateValue, onCodeList, unCI, unPC, unJC, unCSC, unCPPC, unSC, + pyName, pyVersion, jName, jVersion, csName, csVersion, cppName, cppVersion, + swiftName, swiftVersion ) where import GOOL.Drasil.InterfaceCommon (Label, MSBody, MSBlock, VSType, SVariable, @@ -43,11 +44,11 @@ import GOOL.Drasil.InterfaceCommon (Label, MSBody, MSBlock, VSType, SVariable, listIndexExists, at, ScopeSym(..), ParameterSym(..), MethodSym(..), convType) import GOOL.Drasil.InterfaceGOOL (GSProgram, SFile, FSModule, SClass, CSStateVar, VSFunction, OOProg, ProgramSym(..), FileSym(..), ModuleSym(..), - ClassSym(..), OOMethodSym(..), OOTypeSym(..), OOVariableSym(..), ($->), - PermanenceSym(..), privMethod, pubMethod, initializer, nonInitConstructor, - StateVarSym(..), privDVar, pubDVar, pubSVar, OOVariableValue, - OOValueExpression(..), selfFuncApp, newObj, extNewObj, libNewObj, - OODeclStatement(..), objDecNewNoParams, extObjDecNewNoParams, + ClassSym(..), OOMethodSym(..), OOTypeSym(..), OOVariableSym(..), staticVar, + staticConst, ($->), PermanenceSym(..), privMethod, pubMethod, initializer, + nonInitConstructor, StateVarSym(..), privDVar, pubDVar, pubSVar, + OOVariableValue, OOValueExpression(..), selfFuncApp, newObj, extNewObj, + libNewObj, OODeclStatement(..), objDecNewNoParams, extObjDecNewNoParams, OOFuncAppStatement(..), GetSet(..), objMethodCall, objMethodCallNamedArgs, objMethodCallMixedArgs, objMethodCallNoParams, FunctionSym(..), ($.), selfAccess, ObserverPattern(..), initObserverList, addObserver, diff --git a/code/drasil-gool/lib/GOOL/Drasil/CodeInfo.hs b/code/drasil-gool/lib/GOOL/Drasil/CodeInfo.hs index 65f7864c70..097bf1bd4b 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/CodeInfo.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/CodeInfo.hs @@ -112,7 +112,7 @@ instance VariableSym CodeInfo where arrayElem _ _ = noInfo instance OOVariableSym CodeInfo where - staticVar _ _ = noInfo + staticVar' _ _ _ = noInfo self = noInfo classVar _ _ = noInfo extClassVar _ _ = noInfo diff --git a/code/drasil-gool/lib/GOOL/Drasil/InterfaceGOOL.hs b/code/drasil-gool/lib/GOOL/Drasil/InterfaceGOOL.hs index 0d899a833d..c2d5cad7a9 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/InterfaceGOOL.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/InterfaceGOOL.hs @@ -5,9 +5,9 @@ module GOOL.Drasil.InterfaceGOOL ( GSProgram, SFile, FSModule, SClass, VSFunction, CSStateVar, -- Typeclasses OOProg, ProgramSym(..), FileSym(..), ModuleSym(..), ClassSym(..), - OOTypeSym(..), OOVariableSym(..), ($->), OOValueSym, OOVariableValue, - OOValueExpression(..), selfFuncApp, newObj, extNewObj, libNewObj, - OODeclStatement(..), objDecNewNoParams, extObjDecNewNoParams, + OOTypeSym(..), OOVariableSym(..), staticVar, staticConst, ($->), OOValueSym, + OOVariableValue, OOValueExpression(..), selfFuncApp, newObj, extNewObj, + libNewObj, OODeclStatement(..), objDecNewNoParams, extObjDecNewNoParams, OOFuncAppStatement(..), GetSet(..), InternalValueExp(..), objMethodCall, objMethodCallNamedArgs, objMethodCallMixedArgs, objMethodCallNoParams, OOMethodSym(..), privMethod, pubMethod, initializer, nonInitConstructor, @@ -130,13 +130,20 @@ class (TypeSym r) => OOTypeSym r where class (ValueSym r, OOTypeSym r) => OOValueSym r class (VariableSym r, OOTypeSym r) => OOVariableSym r where - staticVar :: Label -> VSType r -> SVariable r + -- Bool: False for variable, True for constant. Required by the Python renderer. + staticVar' :: Bool -> Label -> VSType r -> SVariable r self :: SVariable r classVar :: VSType r -> SVariable r -> SVariable r extClassVar :: VSType r -> SVariable r -> SVariable r objVar :: SVariable r -> SVariable r -> SVariable r objVarSelf :: SVariable r -> SVariable r +staticVar :: (OOVariableSym r) => Label -> VSType r -> SVariable r +staticVar = staticVar' False + +staticConst :: (OOVariableSym r) => Label -> VSType r -> SVariable r +staticConst = staticVar' True + ($->) :: (OOVariableSym r) => SVariable r -> SVariable r -> SVariable r infixl 9 $-> ($->) = objVar diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CSharpRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CSharpRenderer.hs index 9350d0fa23..bbf046a9d9 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CSharpRenderer.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CSharpRenderer.hs @@ -268,7 +268,7 @@ instance VariableSym CSharpCode where arrayElem i = G.arrayElem (litInt i) instance OOVariableSym CSharpCode where - staticVar = G.staticVar + staticVar' _ = G.staticVar self = C.self classVar = CP.classVar R.classVar extClassVar = classVar diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CppRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CppRenderer.hs index 50fb66b696..17de34d055 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CppRenderer.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/CppRenderer.hs @@ -279,7 +279,7 @@ instance (Pair p) => VariableSym (p CppSrcCode CppHdrCode) where arrayElem i = pair1 (arrayElem i) (arrayElem i) instance (Pair p) => OOVariableSym (p CppSrcCode CppHdrCode) where - staticVar n = pair1 (staticVar n) (staticVar n) + staticVar' c n = pair1 (staticVar' c n) (staticVar' c n) self = on2StateValues pair self self classVar = pair2 classVar classVar extClassVar = pair2 extClassVar extClassVar @@ -1163,7 +1163,7 @@ instance VariableSym CppSrcCode where arrayElem i = G.arrayElem (litInt i) instance OOVariableSym CppSrcCode where - staticVar = G.staticVar + staticVar' _ = G.staticVar self = C.self classVar c' v'= do c <- c' @@ -1862,7 +1862,7 @@ instance VariableSym CppHdrCode where arrayElem _ _ = mkStateVar "" void empty instance OOVariableSym CppHdrCode where - staticVar = G.staticVar + staticVar' _ = G.staticVar self = mkStateVar "" void empty classVar _ _ = mkStateVar "" void empty extClassVar _ _ = mkStateVar "" void empty diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/JavaRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/JavaRenderer.hs index 10869878fb..16dce5a389 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/JavaRenderer.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/JavaRenderer.hs @@ -276,7 +276,7 @@ instance VariableSym JavaCode where arrayElem i = G.arrayElem (litInt i) instance OOVariableSym JavaCode where - staticVar = G.staticVar + staticVar' _ = G.staticVar self = C.self classVar = CP.classVar R.classVar extClassVar = classVar diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/PythonRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/PythonRenderer.hs index 206daf04e0..8925ba4ce3 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/PythonRenderer.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/PythonRenderer.hs @@ -49,10 +49,10 @@ import GOOL.Drasil.LanguageRenderer (classDec, dot, ifLabel, elseLabel, import qualified GOOL.Drasil.LanguageRenderer as R (sqrt, fabs, log10, log, exp, sin, cos, tan, asin, acos, atan, floor, ceil, multiStmt, body, classVar, listSetFunc, castObj, dynamic, break, continue, addComments, - commentedMod, commentedItem) + commentedMod, commentedItem, var) import GOOL.Drasil.LanguageRenderer.Constructors (mkStmtNoEnd, mkStateVal, mkVal, mkStateVar, VSOp, unOpPrec, powerPrec, multPrec, andPrec, orPrec, - unExpr, unExpr', typeUnExpr, binExpr, typeBinExpr) + unExpr, unExpr', typeUnExpr, binExpr, typeBinExpr, mkStaticVar) import qualified GOOL.Drasil.LanguageRenderer.LanguagePolymorphic as G ( multiBody, block, multiBlock, listInnerType, obj, negateOp, csc, sec, cot, equalOp, notEqualOp, greaterOp, greaterEqualOp, lessOp, lessEqualOp, plusOp, @@ -262,7 +262,8 @@ instance VariableSym PythonCode where arrayElem i = G.arrayElem (litInt i) instance OOVariableSym PythonCode where - staticVar = G.staticVar + staticVar' c n t = if c then mkStaticVar n t (R.var (map toUpper n)) + else G.staticVar n t self = zoom lensVStoMS getClassName >>= (\l -> mkStateVar pySelf (obj l) (text pySelf)) classVar = CP.classVar R.classVar extClassVar c v = join $ on2StateValues (\t cm -> maybe id ((>>) . modify . diff --git a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs index de781dd094..c73a0b68a6 100644 --- a/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs +++ b/code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs @@ -273,7 +273,7 @@ instance VariableSym SwiftCode where arrayElem i = G.arrayElem (litInt i) instance OOVariableSym SwiftCode where - staticVar = G.staticVar + staticVar' _ = G.staticVar self = CP.self classVar = CP.classVar R.classVar extClassVar = classVar diff --git a/code/stable/pdcontroller/src/python/Calculations.py b/code/stable/pdcontroller/src/python/Calculations.py index a2330c676f..e09617b901 100644 --- a/code/stable/pdcontroller/src/python/Calculations.py +++ b/code/stable/pdcontroller/src/python/Calculations.py @@ -19,7 +19,7 @@ def f(t, y_t): return [y_t[1], -(1.0 + K_d) * y_t[1] + -(20.0 + K_p) * y_t[0] + r_t * K_p] r = scipy.integrate.ode(f) - r.set_integrator("dopri5", atol=Constants.Constants.AbsTol, rtol=Constants.Constants.RelTol) + r.set_integrator("dopri5", atol=Constants.Constants.ABSTOL, rtol=Constants.Constants.RELTOL) r.set_initial_value([0.0, 0.0], 0.0) y_t = [[0.0, 0.0][0]] while r.successful() and r.t < t_sim: diff --git a/code/stable/pdcontroller/src/python/Constants.py b/code/stable/pdcontroller/src/python/Constants.py index 0dffb88d65..652cca6c80 100644 --- a/code/stable/pdcontroller/src/python/Constants.py +++ b/code/stable/pdcontroller/src/python/Constants.py @@ -5,5 +5,5 @@ ## \brief Structure for holding the constant values class Constants: - AbsTol = 1.0e-10 - RelTol = 1.0e-10 + ABSTOL = 1.0e-10 + RELTOL = 1.0e-10 diff --git a/code/stable/projectile/projectile_u_p_l_b_b_c_d/src/python/Projectile.py b/code/stable/projectile/projectile_u_p_l_b_b_c_d/src/python/Projectile.py index 049d529d87..d1dd2d393e 100644 --- a/code/stable/projectile/projectile_u_p_l_b_b_c_d/src/python/Projectile.py +++ b/code/stable/projectile/projectile_u_p_l_b_b_c_d/src/python/Projectile.py @@ -92,8 +92,8 @@ def input_constraints(self): ## \brief Structure for holding the constant values class Constants: - g = 9.8 - epsilon = 2.0e-2 + G = 9.8 + EPSILON = 2.0e-2 ## \brief Calculates flight duration: the time when the projectile lands (s) # \param inParams structure holding the input values @@ -106,7 +106,7 @@ def func_t_flight(inParams): print(" }", file=outfile) outfile.close() - return 2.0 * inParams.v_launch * math.sin(inParams.theta) / Constants.g + return 2.0 * inParams.v_launch * math.sin(inParams.theta) / Constants.G ## \brief Calculates landing position: the distance from the launcher to the final position of the projectile (m) # \param inParams structure holding the input values @@ -119,7 +119,7 @@ def func_p_land(inParams): print(" }", file=outfile) outfile.close() - return 2.0 * inParams.v_launch ** 2.0 * math.sin(inParams.theta) * math.cos(inParams.theta) / Constants.g + return 2.0 * inParams.v_launch ** 2.0 * math.sin(inParams.theta) * math.cos(inParams.theta) / Constants.G ## \brief Calculates distance between the target position and the landing position: the offset between the target position and the landing position (m) # \param inParams structure holding the input values @@ -153,7 +153,7 @@ def func_s(inParams, d_offset): print(" }", file=outfile) outfile.close() - if (math.fabs(d_offset / inParams.p_target) < Constants.epsilon): + if (math.fabs(d_offset / inParams.p_target) < Constants.EPSILON): return "The target was hit." elif (d_offset < 0.0): return "The projectile fell short." diff --git a/code/stable/swhsnopcm/src/python/Constants.py b/code/stable/swhsnopcm/src/python/Constants.py index 8b14813e9e..7dfd14d3b0 100644 --- a/code/stable/swhsnopcm/src/python/Constants.py +++ b/code/stable/swhsnopcm/src/python/Constants.py @@ -5,16 +5,16 @@ ## \brief Structure for holding the constant values class Constants: - pi = 3.14159265 - L_min = 0.1 - L_max = 50.0 - rho_W_min = 950.0 - rho_W_max = 1000.0 - A_C_max = 100000.0 - C_W_min = 4170.0 - C_W_max = 4210.0 - h_C_min = 10.0 - h_C_max = 10000.0 - t_final_max = 86400.0 - AR_min = 1.0e-2 - AR_max = 100.0 + PI = 3.14159265 + L_MIN = 0.1 + L_MAX = 50.0 + RHO_W_MIN = 950.0 + RHO_W_MAX = 1000.0 + A_C_MAX = 100000.0 + C_W_MIN = 4170.0 + C_W_MAX = 4210.0 + H_C_MIN = 10.0 + H_C_MAX = 10000.0 + T_FINAL_MAX = 86400.0 + AR_MIN = 1.0e-2 + AR_MAX = 100.0 diff --git a/code/stable/swhsnopcm/src/python/InputParameters.py b/code/stable/swhsnopcm/src/python/InputParameters.py index d2fbef1477..1a85e0ecc7 100644 --- a/code/stable/swhsnopcm/src/python/InputParameters.py +++ b/code/stable/swhsnopcm/src/python/InputParameters.py @@ -57,7 +57,7 @@ def get_input(filename): # \param L length of tank: the length of the tank (m) # \return volume of the cylindrical tank: the amount of space encompassed by a tank (m^3) def derived_values(D, L): - V_tank = Constants.Constants.pi * (D / 2.0) ** 2.0 * L + V_tank = Constants.Constants.PI * (D / 2.0) ** 2.0 * L return V_tank @@ -74,82 +74,82 @@ def derived_values(D, L): # \param D diameter of tank: the diameter of the tank (m) # \param E_W change in heat energy in the water: change in thermal energy within the water (J) def input_constraints(A_C, C_W, h_C, T_init, t_final, L, T_C, t_step, rho_W, D, E_W): - if (not(A_C <= Constants.Constants.A_C_max)): + if (not(A_C <= Constants.Constants.A_C_MAX)): print("Warning: ", end="") print("A_C has value ", end="") print(A_C, end="") print(", but is suggested to be ", end="") print("below ", end="") - print(Constants.Constants.A_C_max, end="") + print(Constants.Constants.A_C_MAX, end="") print(" (A_C_max)", end="") print(".") - if (not(Constants.Constants.C_W_min < C_W and C_W < Constants.Constants.C_W_max)): + if (not(Constants.Constants.C_W_MIN < C_W and C_W < Constants.Constants.C_W_MAX)): print("Warning: ", end="") print("C_W has value ", end="") print(C_W, end="") print(", but is suggested to be ", end="") print("between ", end="") - print(Constants.Constants.C_W_min, end="") + print(Constants.Constants.C_W_MIN, end="") print(" (C_W_min)", end="") print(" and ", end="") - print(Constants.Constants.C_W_max, end="") + print(Constants.Constants.C_W_MAX, end="") print(" (C_W_max)", end="") print(".") - if (not(Constants.Constants.h_C_min <= h_C and h_C <= Constants.Constants.h_C_max)): + if (not(Constants.Constants.H_C_MIN <= h_C and h_C <= Constants.Constants.H_C_MAX)): print("Warning: ", end="") print("h_C has value ", end="") print(h_C, end="") print(", but is suggested to be ", end="") print("between ", end="") - print(Constants.Constants.h_C_min, end="") + print(Constants.Constants.H_C_MIN, end="") print(" (h_C_min)", end="") print(" and ", end="") - print(Constants.Constants.h_C_max, end="") + print(Constants.Constants.H_C_MAX, end="") print(" (h_C_max)", end="") print(".") - if (not(t_final < Constants.Constants.t_final_max)): + if (not(t_final < Constants.Constants.T_FINAL_MAX)): print("Warning: ", end="") print("t_final has value ", end="") print(t_final, end="") print(", but is suggested to be ", end="") print("below ", end="") - print(Constants.Constants.t_final_max, end="") + print(Constants.Constants.T_FINAL_MAX, end="") print(" (t_final_max)", end="") print(".") - if (not(Constants.Constants.L_min <= L and L <= Constants.Constants.L_max)): + if (not(Constants.Constants.L_MIN <= L and L <= Constants.Constants.L_MAX)): print("Warning: ", end="") print("L has value ", end="") print(L, end="") print(", but is suggested to be ", end="") print("between ", end="") - print(Constants.Constants.L_min, end="") + print(Constants.Constants.L_MIN, end="") print(" (L_min)", end="") print(" and ", end="") - print(Constants.Constants.L_max, end="") + print(Constants.Constants.L_MAX, end="") print(" (L_max)", end="") print(".") - if (not(Constants.Constants.rho_W_min < rho_W and rho_W <= Constants.Constants.rho_W_max)): + if (not(Constants.Constants.RHO_W_MIN < rho_W and rho_W <= Constants.Constants.RHO_W_MAX)): print("Warning: ", end="") print("rho_W has value ", end="") print(rho_W, end="") print(", but is suggested to be ", end="") print("between ", end="") - print(Constants.Constants.rho_W_min, end="") + print(Constants.Constants.RHO_W_MIN, end="") print(" (rho_W_min)", end="") print(" and ", end="") - print(Constants.Constants.rho_W_max, end="") + print(Constants.Constants.RHO_W_MAX, end="") print(" (rho_W_max)", end="") print(".") - if (not(Constants.Constants.AR_min <= D and D <= Constants.Constants.AR_max)): + if (not(Constants.Constants.AR_MIN <= D and D <= Constants.Constants.AR_MAX)): print("Warning: ", end="") print("D has value ", end="") print(D, end="") print(", but is suggested to be ", end="") print("between ", end="") - print(Constants.Constants.AR_min, end="") + print(Constants.Constants.AR_MIN, end="") print(" (AR_min)", end="") print(" and ", end="") - print(Constants.Constants.AR_max, end="") + print(Constants.Constants.AR_MAX, end="") print(" (AR_max)", end="") print(".")