From a04d526efae162786847f62f9ccc153923fe5b96 Mon Sep 17 00:00:00 2001 From: mbs Date: Fri, 10 May 2024 16:31:00 +0100 Subject: [PATCH] updated volumes and nr of subshapes to avoid test failures --- test.models/bracket32.py | 4 +-- test.models/bushing.py | 8 +++--- test.models/case24.py | 4 +-- test.models/plug.py | 52 ++++++++++++++++++------------------ test.models/visor_support.py | 2 +- test.models/wheel_rim.py | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/test.models/bracket32.py b/test.models/bracket32.py index 2148d2444..1d8e39387 100644 --- a/test.models/bracket32.py +++ b/test.models/bracket32.py @@ -832,7 +832,7 @@ ExtrusionCut_3 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Ske # Test reexecution after parameter change Parameter_BPS.setValue(3) model.do() -model.testResultsVolumes(ExtrusionCut_3, [154096.039414040715200826525688171]) +model.testResultsVolumes(ExtrusionCut_3, [154095.923043997521745041012763977]) Parameter_BPS.setValue(6) model.end() @@ -844,6 +844,6 @@ model.testNbSubShapes(ExtrusionCut_3, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_3, GeomAPI_Shape.FACE, [70]) model.testNbSubShapes(ExtrusionCut_3, GeomAPI_Shape.EDGE, [326]) model.testNbSubShapes(ExtrusionCut_3, GeomAPI_Shape.VERTEX, [652]) -model.testResultsVolumes(ExtrusionCut_3, [156878.517351274640532210469245911]) +model.testResultsVolumes(ExtrusionCut_3, [156878.400948128226445987820625305]) assert(model.checkPythonDump()) diff --git a/test.models/bushing.py b/test.models/bushing.py index 72785b370..2012270a3 100644 --- a/test.models/bushing.py +++ b/test.models/bushing.py @@ -588,7 +588,7 @@ ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Ske # Test reexecution after parameter change Parameter_H.setValue(14) model.do() -model.testResultsVolumes(ExtrusionCut_2, [10205.25717]) +model.testResultsVolumes(ExtrusionCut_2, [10205.255530970627660281024873257]) Parameter_H.setValue(12) model.end() @@ -598,8 +598,8 @@ model.testNbResults(ExtrusionCut_2, 1) model.testNbSubResults(ExtrusionCut_2, [0]) model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.FACE, [551]) -model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.EDGE, [3481]) -model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.VERTEX, [6962]) -model.testResultsVolumes(ExtrusionCut_2, [10362.3368]) +model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.EDGE, [3473]) +model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.VERTEX, [6946]) +model.testResultsVolumes(ExtrusionCut_2, [10362.335163650115646305494010448]) assert(model.checkPythonDump()) diff --git a/test.models/case24.py b/test.models/case24.py index c7c7dbbdf..2f089084a 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -795,7 +795,7 @@ ExtrusionCut_4 = model.addExtrusionCut(Part_1_doc, ExtrusionCut_4_objects_1, mod # Test reexecution after parameter change Parameter_R.setValue(5) model.do() -model.testResultsVolumes(ExtrusionCut_4, [502616.749082866765093058347702026]) +model.testResultsVolumes(ExtrusionCut_4, [502617.059752906498033553361892700]) Parameter_R.setValue(3) model.end() @@ -807,6 +807,6 @@ model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.FACE, [81]) model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.EDGE, [406]) model.testNbSubShapes(ExtrusionCut_4, GeomAPI_Shape.VERTEX, [812]) -model.testResultsVolumes(ExtrusionCut_4, [502903.236060981987975537776947021]) +model.testResultsVolumes(ExtrusionCut_4, [502903.528831139323301613330841064]) assert(model.checkPythonDump()) diff --git a/test.models/plug.py b/test.models/plug.py index dd50eb01a..9425557af 100644 --- a/test.models/plug.py +++ b/test.models/plug.py @@ -208,7 +208,7 @@ model.testNbSubShapes(Revolution_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Revolution_1, GeomAPI_Shape.FACE, [35]) model.testNbSubShapes(Revolution_1, GeomAPI_Shape.EDGE, [114]) model.testNbSubShapes(Revolution_1, GeomAPI_Shape.VERTEX, [228]) -model.testResultsVolumes(Revolution_1, [29055.346994571114919381216168404]) +model.testResultsVolumes(Revolution_1, [29055.379817395245481748133897781]) Plane_4 = model.addPlane(Part_1_doc, model.selection("EDGE", "PartSet/OY"), model.selection("VERTEX", "Sketch_1/SketchPoint_2"), True) @@ -232,7 +232,7 @@ model.testNbSubShapes(ExtrusionCut_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_1, GeomAPI_Shape.FACE, [36]) model.testNbSubShapes(ExtrusionCut_1, GeomAPI_Shape.EDGE, [132]) model.testNbSubShapes(ExtrusionCut_1, GeomAPI_Shape.VERTEX, [264]) -model.testResultsVolumes(ExtrusionCut_1, [28943.115000463178148493170738220]) +model.testResultsVolumes(ExtrusionCut_1, [28943.145978945081878919154405594]) Fillet_1 = model.addFillet(Part_1_doc, [model.selection("EDGE", "[Revolution_1_1/Generated_Face&Sketch_1/SketchLine_21][Revolution_1_1/Generated_Face&Sketch_1/SketchLine_20]")], "Fillet1") # check Fillet_1 @@ -242,7 +242,7 @@ model.testNbSubShapes(Fillet_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.FACE, [37]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.EDGE, [136]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.VERTEX, [272]) -model.testResultsVolumes(Fillet_1, [28340.280766451105591841042041779]) +model.testResultsVolumes(Fillet_1, [28340.312197727056627627462148666]) Fillet_2 = model.addFillet(Part_1_doc, [model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_31"), model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_29"), model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_27"), model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_25")], "Fillet2") # check Fillet_2 @@ -252,7 +252,7 @@ model.testNbSubShapes(Fillet_2, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_2, GeomAPI_Shape.FACE, [45]) model.testNbSubShapes(Fillet_2, GeomAPI_Shape.EDGE, [168]) model.testNbSubShapes(Fillet_2, GeomAPI_Shape.VERTEX, [336]) -model.testResultsVolumes(Fillet_2, [28339.715350479829794494435191154]) +model.testResultsVolumes(Fillet_2, [28339.746210508856165688484907150]) Fillet_3 = model.addFillet(Part_1_doc, [model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_19")], "Fillet3") # check Fillet_3 @@ -262,7 +262,7 @@ model.testNbSubShapes(Fillet_3, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_3, GeomAPI_Shape.FACE, [47]) model.testNbSubShapes(Fillet_3, GeomAPI_Shape.EDGE, [176]) model.testNbSubShapes(Fillet_3, GeomAPI_Shape.VERTEX, [352]) -model.testResultsVolumes(Fillet_3, [28338.609830057110229972749948502]) +model.testResultsVolumes(Fillet_3, [28338.641671687521011335775256157]) Fillet_4 = model.addFillet(Part_1_doc, [model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_11")], "Fillet3") # check Fillet_4 @@ -272,7 +272,7 @@ model.testNbSubShapes(Fillet_4, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_4, GeomAPI_Shape.FACE, [49]) model.testNbSubShapes(Fillet_4, GeomAPI_Shape.EDGE, [184]) model.testNbSubShapes(Fillet_4, GeomAPI_Shape.VERTEX, [368]) -model.testResultsVolumes(Fillet_4, [28347.280717884430487174540758133]) +model.testResultsVolumes(Fillet_4, [28347.312910383880080189555883408]) Fillet_5 = model.addFillet(Part_1_doc, [model.selection("FACE", "Revolution_1_1/Generated_Face&Sketch_1/SketchLine_9")], "Fillet2") # check Fillet_5 @@ -282,7 +282,7 @@ model.testNbSubShapes(Fillet_5, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_5, GeomAPI_Shape.FACE, [51]) model.testNbSubShapes(Fillet_5, GeomAPI_Shape.EDGE, [192]) model.testNbSubShapes(Fillet_5, GeomAPI_Shape.VERTEX, [384]) -model.testResultsVolumes(Fillet_5, [28343.655816829603281803429126740]) +model.testResultsVolumes(Fillet_5, [28343.688540020142681896686553955]) ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [], model.selection(), "D4_out/2", "D4_out/2", [model.selection("SOLID", "Fillet_5_1")]) Sketch_3 = model.addSketch(Part_1_doc, model.standardPlane("XOY")) @@ -330,7 +330,7 @@ model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.FACE, [55]) model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.EDGE, [214]) model.testNbSubShapes(ExtrusionCut_2, GeomAPI_Shape.VERTEX, [428]) -model.testResultsVolumes(ExtrusionCut_2, [28317.789547563083033310249447823]) +model.testResultsVolumes(ExtrusionCut_2, [28317.815904764789593173190951347]) Folder_1 = model.addFolder(Part_1_doc, Fillet_1, Fillet_5) @@ -386,9 +386,9 @@ model.testNbResults(RevolutionCut_1, 1) model.testNbSubResults(RevolutionCut_1, [0]) model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.FACE, [59]) -model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.EDGE, [242]) -model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.VERTEX, [484]) -model.testResultsVolumes(RevolutionCut_1, [28297.246041844206047244369983673]) +model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.EDGE, [240]) +model.testNbSubShapes(RevolutionCut_1, GeomAPI_Shape.VERTEX, [480]) +model.testResultsVolumes(RevolutionCut_1, [28297.263961183885840000584721565]) RevolutionCut_2 = model.addRevolutionCut(Part_1_doc, [], model.selection("EDGE", "PartSet/OX"), 360, 0, [model.selection("SOLID", "RevolutionCut_1_1")]) Sketch_5 = model.addSketch(Part_1_doc, model.standardPlane("XOY")) @@ -420,9 +420,9 @@ model.testNbResults(RevolutionCut_2, 1) model.testNbSubResults(RevolutionCut_2, [0]) model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.FACE, [60]) -model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.EDGE, [246]) -model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.VERTEX, [492]) -model.testResultsVolumes(RevolutionCut_2, [28288.868184623894194373860955238]) +model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.EDGE, [244]) +model.testNbSubShapes(RevolutionCut_2, GeomAPI_Shape.VERTEX, [488]) +model.testResultsVolumes(RevolutionCut_2, [28288.886350037606462137773633003]) Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "PartSet/XOY"), 0, False) Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "RevolutionCut_2_1"), model.selection("FACE", "Plane_2")]) @@ -431,8 +431,8 @@ model.testNbResults(Partition_1, 1) model.testNbSubResults(Partition_1, [2]) model.testNbSubShapes(Partition_1, GeomAPI_Shape.SOLID, [2]) model.testNbSubShapes(Partition_1, GeomAPI_Shape.FACE, [127]) -model.testNbSubShapes(Partition_1, GeomAPI_Shape.EDGE, [738]) -model.testNbSubShapes(Partition_1, GeomAPI_Shape.VERTEX, [1476]) +model.testNbSubShapes(Partition_1, GeomAPI_Shape.EDGE, [736]) +model.testNbSubShapes(Partition_1, GeomAPI_Shape.VERTEX, [1472]) model.testResultsVolumes(Partition_1, [28288.886256640704232268035411835]) Result = model.addRemoveSubShapes(Part_1_doc, model.selection("COMPSOLID", "Partition_1_1")) @@ -471,8 +471,8 @@ model.testNbResults(Result, 1) model.testNbSubResults(Result, [0]) model.testNbSubShapes(Result, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Result, GeomAPI_Shape.FACE, [63]) -model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [364]) -model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [728]) +model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366]) +model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732]) model.testResultsVolumes(Result, [22968.704503291784931207075715065]) Param_Drill1Loc.setValue(15) @@ -481,8 +481,8 @@ model.testNbResults(Result, 1) model.testNbSubResults(Result, [0]) model.testNbSubShapes(Result, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Result, GeomAPI_Shape.FACE, [63]) -model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [364]) -model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [728]) +model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366]) +model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732]) model.testResultsVolumes(Result, [22969.259323538735770853236317635]) Param_Drill1Holder.setValue(16) @@ -490,8 +490,8 @@ model.do() model.testNbSubResults(Result, [0]) model.testNbSubShapes(Result, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Result, GeomAPI_Shape.FACE, [63]) -model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [364]) -model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [728]) +model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366]) +model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732]) model.testResultsVolumes(Result, [22969.553506208951148437336087227]) Param_Drill2Loc.setValue(7.5) @@ -500,8 +500,8 @@ model.testNbResults(Result, 1) model.testNbSubResults(Result, [0]) model.testNbSubShapes(Result, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Result, GeomAPI_Shape.FACE, [63]) -model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [364]) -model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [728]) +model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366]) +model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732]) model.testResultsVolumes(Result, [22969.986144881491782143712043762]) Param_Drill2Radius.setValue(1.9) @@ -510,8 +510,8 @@ model.testNbResults(Result, 1) model.testNbSubResults(Result, [0]) model.testNbSubShapes(Result, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Result, GeomAPI_Shape.FACE, [63]) -model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [364]) -model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [728]) +model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366]) +model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732]) model.testResultsVolumes(Result, [22956.808010807682876475155353546]) Param_Fillet1.setValue(3) diff --git a/test.models/visor_support.py b/test.models/visor_support.py index 6bd3b6fd1..4be5eafc6 100644 --- a/test.models/visor_support.py +++ b/test.models/visor_support.py @@ -360,7 +360,7 @@ model.testNbSubShapes(Fillet_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.FACE, [5]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.EDGE, [18]) model.testNbSubShapes(Fillet_1, GeomAPI_Shape.VERTEX, [36]) -model.testResultsVolumes(Fillet_1, [13.34526088678]) +model.testResultsVolumes(Fillet_1, [13.345256419562657512756231881]) Symmetry_1 = model.addSymmetry(Part_1_doc, [model.selection("SOLID", "Fillet_1_1")], model.selection("FACE", "PartSet/YOZ"), keepOriginal = True, keepSubResults = True) Cut_1 = model.addCut(Part_1_doc, [model.selection("SOLID", "Chamfer_1_1")], [model.selection("COMPOUND", "Symmetry_1_1")], keepSubResults = True) diff --git a/test.models/wheel_rim.py b/test.models/wheel_rim.py index dd35a62f7..9fda02a26 100644 --- a/test.models/wheel_rim.py +++ b/test.models/wheel_rim.py @@ -213,6 +213,6 @@ model.testNbSubShapes(Boolean_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.FACE, [35]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.EDGE, [162]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.VERTEX, [324]) -model.testResultsVolumes(Boolean_1, [2052731.260104598477482795715332031]) +model.testResultsVolumes(Boolean_1, [2052720.339581762673333287239074707]) assert(model.checkPythonDump()) -- 2.39.2