From b75501addda91ad73976fb198b1f7c1d2774f660 Mon Sep 17 00:00:00 2001 From: Jinxuan He Date: Fri, 16 Dec 2022 15:42:59 +0100 Subject: [PATCH 1/2] Update default value from 0.0 to None to align them with the default value in speckle-sharp --- src/specklepy/objects/structural/results.py | 226 ++++++++++---------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/src/specklepy/objects/structural/results.py b/src/specklepy/objects/structural/results.py index 49e2c99..ac62dcd 100644 --- a/src/specklepy/objects/structural/results.py +++ b/src/specklepy/objects/structural/results.py @@ -21,28 +21,28 @@ class ResultSet1D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet1D"): class Result1D(Result, speckle_type=STRUCTURAL_RESULTS + "Result1D"): element: Element1D = None - position: float = 0.0 - dispX: float = 0.0 - dispY: float = 0.0 - dispZ: float = 0.0 - rotXX: float = 0.0 - rotYY: float = 0.0 - rotZZ: float = 0.0 - forceX: float = 0.0 - forceY: float = 0.0 - forceZ: float = 0.0 - momentXX: float = 0.0 - momentYY: float = 0.0 - momentZZ: float = 0.0 - axialStress: float = 0.0 - shearStressY: float = 0.0 - shearStressZ: float = 0.0 - bendingStressYPos: float = 0.0 - bendingStressYNeg: float = 0.0 - bendingStressZPos: float = 0.0 - bendingStressZNeg: float = 0.0 - combinedStressMax: float = 0.0 - combinedStressMin: float = 0.0 + position: float = None + dispX: float = None + dispY: float = None + dispZ: float = None + rotXX: float = None + rotYY: float = None + rotZZ: float = None + forceX: float = None + forceY: float = None + forceZ: float = None + momentXX: float = None + momentYY: float = None + momentZZ: float = None + axialStress: float = None + shearStressY: float = None + shearStressZ: float = None + bendingStressYPos: float = None + bendingStressYNeg: float = None + bendingStressZPos: float = None + bendingStressZNeg: float = None + combinedStressMax: float = None + combinedStressMin: float = None class ResultSet2D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet2D"): @@ -52,35 +52,35 @@ class ResultSet2D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet2D"): class Result2D(Result, speckle_type=STRUCTURAL_RESULTS + "Result2D"): element: Element2D = None position: List - dispX: float = 0.0 - dispY: float = 0.0 - dispZ: float = 0.0 - forceXX: float = 0.0 - forceYY: float = 0.0 - forceXY: float = 0.0 - momentXX: float = 0.0 - momentYY: float = 0.0 - momentXY: float = 0.0 - shearX: float = 0.0 - shearY: float = 0.0 - stressTopXX: float = 0.0 - stressTopYY: float = 0.0 - stressTopZZ: float = 0.0 - stressTopXY: float = 0.0 - stressTopYZ: float = 0.0 - stressTopZX: float = 0.0 - stressMidXX: float = 0.0 - stressMidYY: float = 0.0 - stressMidZZ: float = 0.0 - stressMidXY: float = 0.0 - stressMidYZ: float = 0.0 - stressMidZX: float = 0.0 - stressBotXX: float = 0.0 - stressBotYY: float = 0.0 - stressBotZZ: float = 0.0 - stressBotXY: float = 0.0 - stressBotYZ: float = 0.0 - stressBotZX: float = 0.0 + dispX: float = None + dispY: float = None + dispZ: float = None + forceXX: float = None + forceYY: float = None + forceXY: float = None + momentXX: float = None + momentYY: float = None + momentXY: float = None + shearX: float = None + shearY: float = None + stressTopXX: float = None + stressTopYY: float = None + stressTopZZ: float = None + stressTopXY: float = None + stressTopYZ: float = None + stressTopZX: float = None + stressMidXX: float = None + stressMidYY: float = None + stressMidZZ: float = None + stressMidXY: float = None + stressMidYZ: float = None + stressMidZX: float = None + stressBotXX: float = None + stressBotYY: float = None + stressBotZZ: float = None + stressBotXY: float = None + stressBotYZ: float = None + stressBotZX: float = None class ResultSet3D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet3D"): @@ -90,42 +90,42 @@ class ResultSet3D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet3D"): class Result3D(Result, speckle_type=STRUCTURAL_RESULTS + "Result3D"): element: Element3D = None position: List - dispX: float = 0.0 - dispY: float = 0.0 - dispZ: float = 0.0 - stressXX: float = 0.0 - stressYY: float = 0.0 - stressZZ: float = 0.0 - stressXY: float = 0.0 - stressYZ: float = 0.0 - stressZX: float = 0.0 + dispX: float = None + dispY: float = None + dispZ: float = None + stressXX: float = None + stressYY: float = None + stressZZ: float = None + stressXY: float = None + stressYZ: float = None + stressZX: float = None class ResultGlobal(Result, speckle_type=STRUCTURAL_RESULTS + "ResultGlobal"): model: Model = None - loadX: float = 0.0 - loadY: float = 0.0 - loadZ: float = 0.0 - loadXX: float = 0.0 - loadYY: float = 0.0 - loadZZ: float = 0.0 - reactionX: float = 0.0 - reactionY: float = 0.0 - reactionZ: float = 0.0 - reactionXX: float = 0.0 - reactionYY: float = 0.0 - reactionZZ: float = 0.0 - mode: float = 0.0 - frequency: float = 0.0 - loadFactor: float = 0.0 - modalStiffness: float = 0.0 - modalGeoStiffness: float = 0.0 - effMassX: float = 0.0 - effMassY: float = 0.0 - effMassZ: float = 0.0 - effMassXX: float = 0.0 - effMassYY: float = 0.0 - effMassZZ: float = 0.0 + loadX: float = None + loadY: float = None + loadZ: float = None + loadXX: float = None + loadYY: float = None + loadZZ: float = None + reactionX: float = None + reactionY: float = None + reactionZ: float = None + reactionXX: float = None + reactionYY: float = None + reactionZZ: float = None + mode: float = None + frequency: float = None + loadFactor: float = None + modalStiffness: float = None + modalGeoStiffness: float = None + effMassX: float = None + effMassY: float = None + effMassZ: float = None + effMassXX: float = None + effMassYY: float = None + effMassZZ: float = None class ResultSetNode(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSetNode"): @@ -134,36 +134,36 @@ class ResultSetNode(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSetNode"): class ResultNode(Result, speckle_type=STRUCTURAL_RESULTS + " ResultNode"): node: Node = None - dispX: float = 0.0 - dispY: float = 0.0 - dispZ: float = 0.0 - rotXX: float = 0.0 - rotYY: float = 0.0 - rotZZ: float = 0.0 - reactionX: float = 0.0 - reactionY: float = 0.0 - reactionZ: float = 0.0 - reactionXX: float = 0.0 - reactionYY: float = 0.0 - reactionZZ: float = 0.0 - constraintX: float = 0.0 - constraintY: float = 0.0 - constraintZ: float = 0.0 - constraintXX: float = 0.0 - constraintYY: float = 0.0 - constraintZZ: float = 0.0 - velX: float = 0.0 - velY: float = 0.0 - velZ: float = 0.0 - velXX: float = 0.0 - velYY: float = 0.0 - velZZ: float = 0.0 - accX: float = 0.0 - accY: float = 0.0 - accZ: float = 0.0 - accXX: float = 0.0 - accYY: float = 0.0 - accZZ: float = 0.0 + dispX: float = None + dispY: float = None + dispZ: float = None + rotXX: float = None + rotYY: float = None + rotZZ: float = None + reactionX: float = None + reactionY: float = None + reactionZ: float = None + reactionXX: float = None + reactionYY: float = None + reactionZZ: float = None + constraintX: float = None + constraintY: float = None + constraintZ: float = None + constraintXX: float = None + constraintYY: float = None + constraintZZ: float = None + velX: float = None + velY: float = None + velZ: float = None + velXX: float = None + velYY: float = None + velZZ: float = None + accX: float = None + accY: float = None + accZ: float = None + accXX: float = None + accYY: float = None + accZZ: float = None class ResultSetAll(Base, speckle_type=None): From c91f673dba428e579679a08e36ec82b7d943fa89 Mon Sep 17 00:00:00 2001 From: Jinxuan He Date: Wed, 21 Dec 2022 12:38:21 +0100 Subject: [PATCH 2/2] Add optional for float, regarding type checking --- src/specklepy/objects/structural/results.py | 228 ++++++++++---------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/src/specklepy/objects/structural/results.py b/src/specklepy/objects/structural/results.py index ac62dcd..11012ba 100644 --- a/src/specklepy/objects/structural/results.py +++ b/src/specklepy/objects/structural/results.py @@ -1,4 +1,4 @@ -from typing import List +from typing import List, Optional from ..base import Base from ..geometry import * @@ -21,28 +21,28 @@ class ResultSet1D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet1D"): class Result1D(Result, speckle_type=STRUCTURAL_RESULTS + "Result1D"): element: Element1D = None - position: float = None - dispX: float = None - dispY: float = None - dispZ: float = None - rotXX: float = None - rotYY: float = None - rotZZ: float = None - forceX: float = None - forceY: float = None - forceZ: float = None - momentXX: float = None - momentYY: float = None - momentZZ: float = None - axialStress: float = None - shearStressY: float = None - shearStressZ: float = None - bendingStressYPos: float = None - bendingStressYNeg: float = None - bendingStressZPos: float = None - bendingStressZNeg: float = None - combinedStressMax: float = None - combinedStressMin: float = None + position: Optional[float] = None + dispX: Optional[float] = None + dispY: Optional[float] = None + dispZ: Optional[float] = None + rotXX: Optional[float] = None + rotYY: Optional[float] = None + rotZZ: Optional[float] = None + forceX: Optional[float] = None + forceY: Optional[float] = None + forceZ: Optional[float] = None + momentXX: Optional[float] = None + momentYY: Optional[float] = None + momentZZ: Optional[float] = None + axialStress: Optional[float] = None + shearStressY: Optional[float] = None + shearStressZ: Optional[float] = None + bendingStressYPos: Optional[float] = None + bendingStressYNeg: Optional[float] = None + bendingStressZPos: Optional[float] = None + bendingStressZNeg: Optional[float] = None + combinedStressMax: Optional[float] = None + combinedStressMin: Optional[float] = None class ResultSet2D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet2D"): @@ -52,35 +52,35 @@ class ResultSet2D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet2D"): class Result2D(Result, speckle_type=STRUCTURAL_RESULTS + "Result2D"): element: Element2D = None position: List - dispX: float = None - dispY: float = None - dispZ: float = None - forceXX: float = None - forceYY: float = None - forceXY: float = None - momentXX: float = None - momentYY: float = None - momentXY: float = None - shearX: float = None - shearY: float = None - stressTopXX: float = None - stressTopYY: float = None - stressTopZZ: float = None - stressTopXY: float = None - stressTopYZ: float = None - stressTopZX: float = None - stressMidXX: float = None - stressMidYY: float = None - stressMidZZ: float = None - stressMidXY: float = None - stressMidYZ: float = None - stressMidZX: float = None - stressBotXX: float = None - stressBotYY: float = None - stressBotZZ: float = None - stressBotXY: float = None - stressBotYZ: float = None - stressBotZX: float = None + dispX: Optional[float] = None + dispY: Optional[float] = None + dispZ: Optional[float] = None + forceXX: Optional[float] = None + forceYY: Optional[float] = None + forceXY: Optional[float] = None + momentXX: Optional[float] = None + momentYY: Optional[float] = None + momentXY: Optional[float] = None + shearX: Optional[float] = None + shearY: Optional[float] = None + stressTopXX: Optional[float] = None + stressTopYY: Optional[float] = None + stressTopZZ: Optional[float] = None + stressTopXY: Optional[float] = None + stressTopYZ: Optional[float] = None + stressTopZX: Optional[float] = None + stressMidXX: Optional[float] = None + stressMidYY: Optional[float] = None + stressMidZZ: Optional[float] = None + stressMidXY: Optional[float] = None + stressMidYZ: Optional[float] = None + stressMidZX: Optional[float] = None + stressBotXX: Optional[float] = None + stressBotYY: Optional[float] = None + stressBotZZ: Optional[float] = None + stressBotXY: Optional[float] = None + stressBotYZ: Optional[float] = None + stressBotZX: Optional[float] = None class ResultSet3D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet3D"): @@ -90,42 +90,42 @@ class ResultSet3D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet3D"): class Result3D(Result, speckle_type=STRUCTURAL_RESULTS + "Result3D"): element: Element3D = None position: List - dispX: float = None - dispY: float = None - dispZ: float = None - stressXX: float = None - stressYY: float = None - stressZZ: float = None - stressXY: float = None - stressYZ: float = None - stressZX: float = None + dispX: Optional[float] = None + dispY: Optional[float] = None + dispZ: Optional[float] = None + stressXX: Optional[float] = None + stressYY: Optional[float] = None + stressZZ: Optional[float] = None + stressXY: Optional[float] = None + stressYZ: Optional[float] = None + stressZX: Optional[float] = None class ResultGlobal(Result, speckle_type=STRUCTURAL_RESULTS + "ResultGlobal"): model: Model = None - loadX: float = None - loadY: float = None - loadZ: float = None - loadXX: float = None - loadYY: float = None - loadZZ: float = None - reactionX: float = None - reactionY: float = None - reactionZ: float = None - reactionXX: float = None - reactionYY: float = None - reactionZZ: float = None - mode: float = None - frequency: float = None - loadFactor: float = None - modalStiffness: float = None - modalGeoStiffness: float = None - effMassX: float = None - effMassY: float = None - effMassZ: float = None - effMassXX: float = None - effMassYY: float = None - effMassZZ: float = None + loadX: Optional[float] = None + loadY: Optional[float] = None + loadZ: Optional[float] = None + loadXX: Optional[float] = None + loadYY: Optional[float] = None + loadZZ: Optional[float] = None + reactionX: Optional[float] = None + reactionY: Optional[float] = None + reactionZ: Optional[float] = None + reactionXX: Optional[float] = None + reactionYY: Optional[float] = None + reactionZZ: Optional[float] = None + mode: Optional[float] = None + frequency: Optional[float] = None + loadFactor: Optional[float] = None + modalStiffness: Optional[float] = None + modalGeoStiffness: Optional[float] = None + effMassX: Optional[float] = None + effMassY: Optional[float] = None + effMassZ: Optional[float] = None + effMassXX: Optional[float] = None + effMassYY: Optional[float] = None + effMassZZ: Optional[float] = None class ResultSetNode(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSetNode"): @@ -134,36 +134,36 @@ class ResultSetNode(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSetNode"): class ResultNode(Result, speckle_type=STRUCTURAL_RESULTS + " ResultNode"): node: Node = None - dispX: float = None - dispY: float = None - dispZ: float = None - rotXX: float = None - rotYY: float = None - rotZZ: float = None - reactionX: float = None - reactionY: float = None - reactionZ: float = None - reactionXX: float = None - reactionYY: float = None - reactionZZ: float = None - constraintX: float = None - constraintY: float = None - constraintZ: float = None - constraintXX: float = None - constraintYY: float = None - constraintZZ: float = None - velX: float = None - velY: float = None - velZ: float = None - velXX: float = None - velYY: float = None - velZZ: float = None - accX: float = None - accY: float = None - accZ: float = None - accXX: float = None - accYY: float = None - accZZ: float = None + dispX: Optional[float] = None + dispY: Optional[float] = None + dispZ: Optional[float] = None + rotXX: Optional[float] = None + rotYY: Optional[float] = None + rotZZ: Optional[float] = None + reactionX: Optional[float] = None + reactionY: Optional[float] = None + reactionZ: Optional[float] = None + reactionXX: Optional[float] = None + reactionYY: Optional[float] = None + reactionZZ: Optional[float] = None + constraintX: Optional[float] = None + constraintY: Optional[float] = None + constraintZ: Optional[float] = None + constraintXX: Optional[float] = None + constraintYY: Optional[float] = None + constraintZZ: Optional[float] = None + velX: Optional[float] = None + velY: Optional[float] = None + velZ: Optional[float] = None + velXX: Optional[float] = None + velYY: Optional[float] = None + velZZ: Optional[float] = None + accX: Optional[float] = None + accY: Optional[float] = None + accZ: Optional[float] = None + accXX: Optional[float] = None + accYY: Optional[float] = None + accZZ: Optional[float] = None class ResultSetAll(Base, speckle_type=None):