Skip to content

Commit a921ba3

Browse files
author
gwiedebach
committed
Fix test.
1 parent 3af99f1 commit a921ba3

File tree

3 files changed

+8
-30
lines changed

3 files changed

+8
-30
lines changed

Atlas/test/us/ihmc/atlas/ObstacleCourseTests/AtlasPelvisLowGainsTest.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,6 @@ protected YoDouble getPelvisOrientationErrorVariableName(SimulationConstructionS
5656
return (YoDouble) scs.getVariable(FeedbackControllerToolbox.class.getSimpleName(), "pelvisErrorRotationVectorZ");
5757
}
5858

59-
@Override
60-
public String getKpPelvisOrientationName()
61-
{
62-
return "kpXYAngularPelvisOrientation";
63-
}
64-
65-
@Override
66-
public String getZetaPelvisOrientationName()
67-
{
68-
return "zetaXYAngularPelvisOrientation";
69-
}
70-
71-
7259
@Override
7360
public InverseDynamicsCalculatorListener getInverseDynamicsCalculatorListener(FullRobotModel controllersFullRobotModel, FloatingRootJointRobot robot)
7461
{

IHMCAvatarInterfaces/test/us/ihmc/avatar/obstacleCourseTests/DRCPelvisLowGainsTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import us.ihmc.avatar.MultiRobotTestInterface;
1111
import us.ihmc.avatar.drcRobot.DRCRobotModel;
1212
import us.ihmc.avatar.testTools.DRCSimulationTestHelper;
13+
import us.ihmc.commonWalkingControlModules.highLevelHumanoidControl.factories.HighLevelControlManagerFactory;
1314
import us.ihmc.continuousIntegration.ContinuousIntegrationAnnotations.ContinuousIntegrationTest;
1415
import us.ihmc.euclid.geometry.BoundingBox3D;
1516
import us.ihmc.euclid.tuple3D.Point3D;
@@ -25,6 +26,7 @@
2526
import us.ihmc.simulationconstructionset.util.simulationTesting.SimulationTestingParameters;
2627
import us.ihmc.tools.MemoryTools;
2728
import us.ihmc.tools.thread.ThreadTools;
29+
import us.ihmc.yoVariables.variable.YoBoolean;
2830
import 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);

Valkyrie/test/us/ihmc/valkyrie/simulation/ValkyriePelvisLowGainsTest.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,6 @@ protected YoDouble getPelvisOrientationErrorVariableName(SimulationConstructionS
4848
"v1PelvisOrientationErrorMagnitude");
4949
}
5050

51-
@Override
52-
public String getKpPelvisOrientationName()
53-
{
54-
return "kpXYAngularPelvisOrientation";
55-
}
56-
57-
@Override
58-
public String getZetaPelvisOrientationName()
59-
{
60-
return "zetaXYAngularPelvisOrientation";
61-
}
62-
6351
@Override
6452
public InverseDynamicsCalculatorListener getInverseDynamicsCalculatorListener(FullRobotModel controllersFullRobotModel, FloatingRootJointRobot robot)
6553
{

0 commit comments

Comments
 (0)