1010import us .ihmc .avatar .MultiRobotTestInterface ;
1111import us .ihmc .avatar .drcRobot .DRCRobotModel ;
1212import us .ihmc .avatar .testTools .DRCSimulationTestHelper ;
13+ import us .ihmc .commonWalkingControlModules .highLevelHumanoidControl .factories .HighLevelControlManagerFactory ;
1314import us .ihmc .continuousIntegration .ContinuousIntegrationAnnotations .ContinuousIntegrationTest ;
1415import us .ihmc .euclid .geometry .BoundingBox3D ;
1516import us .ihmc .euclid .tuple3D .Point3D ;
2526import us .ihmc .simulationconstructionset .util .simulationTesting .SimulationTestingParameters ;
2627import us .ihmc .tools .MemoryTools ;
2728import us .ihmc .tools .thread .ThreadTools ;
29+ import us .ihmc .yoVariables .variable .YoBoolean ;
2830import us .ihmc .yoVariables .variable .YoDouble ;
2931
3032/**
@@ -109,8 +111,12 @@ public boolean isSimulationDone()
109111
110112 simulationConstructionSet .setSimulateDoneCriterion (checkPelvisOrientationError );
111113
112- YoDouble kpPelvisOrientation = (YoDouble ) simulationConstructionSet .getVariable (getKpPelvisOrientationName ());
113- YoDouble zetaPelvisOrientation = (YoDouble ) simulationConstructionSet .getVariable (getZetaPelvisOrientationName ());
114+ String namespace = HighLevelControlManagerFactory .class .getSimpleName ();
115+ YoBoolean updatePelvisDampingFromRatio = (YoBoolean ) simulationConstructionSet .getVariable (namespace , "UpdateFromDampingRatioPelvisOrientation" );
116+ updatePelvisDampingFromRatio .set (true );
117+
118+ YoDouble kpPelvisOrientation = (YoDouble ) simulationConstructionSet .getVariable (namespace , "kpXYPelvisOrientation" );
119+ YoDouble zetaPelvisOrientation = (YoDouble ) simulationConstructionSet .getVariable (namespace , "zetaXYPelvisOrientation" );
114120
115121 // kp = 20.0, zeta = 0.7 causes problems when running multithreaded. kp = 1.0, zeta = 0.7 causes problems when running single threaded.
116122 kpPelvisOrientation .set (1.0 );
@@ -131,9 +137,6 @@ public boolean isSimulationDone()
131137 BambooTools .reportTestFinishedMessage (simulationTestingParameters .getShowWindows ());
132138 }
133139
134- public abstract String getZetaPelvisOrientationName ();
135- public abstract String getKpPelvisOrientationName ();
136-
137140 private void setupCameraForElvisPelvis ()
138141 {
139142 Point3D cameraFix = new Point3D (0.0 , 0.0 , 0.9 );
0 commit comments