-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #316 from nkhosh/contact_keyframes_breakdown
Interact task: Contact keyframes
- Loading branch information
Showing
13 changed files
with
859 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Copyright 2022 DeepMind Technologies Limited | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#include "mjpc/tasks/humanoid/interact/contact_keyframe.h" | ||
|
||
namespace mjpc::humanoid { | ||
|
||
void ContactPair::Reset() { | ||
body1 = kNotSelectedInteract; | ||
body2 = kNotSelectedInteract; | ||
geom1 = kNotSelectedInteract; | ||
geom2 = kNotSelectedInteract; | ||
for (int i = 0; i < 3; i++) { | ||
local_pos1[i] = 0.; | ||
local_pos2[i] = 0.; | ||
} | ||
} | ||
|
||
void ContactKeyframe::Reset() { | ||
name.clear(); | ||
for (auto& contact_pair : contact_pairs) contact_pair.Reset(); | ||
|
||
facing_target.clear(); | ||
weight.clear(); | ||
} | ||
} // namespace mjpc::humanoid |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
// Copyright 2022 DeepMind Technologies Limited | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#ifndef MJPC_TASKS_HUMANOID_INTERACT_CONTACT_KEYFRAME_H_ | ||
#define MJPC_TASKS_HUMANOID_INTERACT_CONTACT_KEYFRAME_H_ | ||
|
||
#include <mujoco/mujoco.h> | ||
|
||
#include <map> | ||
#include <string> | ||
#include <vector> | ||
|
||
namespace mjpc::humanoid { | ||
|
||
// ---------- Constants ----------------- // | ||
constexpr int kNotSelectedInteract = -1; | ||
constexpr int kNumberOfContactPairsInteract = 5; | ||
|
||
class ContactPair { | ||
public: | ||
int body1, body2, geom1, geom2; | ||
mjtNum local_pos1[3], local_pos2[3]; | ||
|
||
ContactPair() | ||
: body1(kNotSelectedInteract), | ||
body2(kNotSelectedInteract), | ||
geom1(kNotSelectedInteract), | ||
geom2(kNotSelectedInteract), | ||
local_pos1{0.}, | ||
local_pos2{0.} {} | ||
|
||
void Reset(); | ||
}; | ||
|
||
class ContactKeyframe { | ||
public: | ||
std::string name; | ||
ContactPair contact_pairs[kNumberOfContactPairsInteract]; | ||
|
||
// the direction on the xy-plane for the torso to point towards | ||
std::vector<mjtNum> facing_target; | ||
|
||
// weight of all residual terms (name -> value map) | ||
std::map<std::string, mjtNum> weight; | ||
|
||
ContactKeyframe() : name(""), contact_pairs{}, facing_target(), weight() {} | ||
|
||
void Reset(); | ||
}; | ||
|
||
} // namespace mjpc::humanoid | ||
|
||
#endif // MJPC_TASKS_HUMANOID_INTERACT_CONTACT_KEYFRAME_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,243 @@ | ||
// Copyright 2022 DeepMind Technologies Limited | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#include "mjpc/tasks/humanoid/interact/interact.h" | ||
|
||
#include <mujoco/mujoco.h> | ||
|
||
#include "mjpc/utilities.h" | ||
|
||
namespace mjpc::humanoid { | ||
|
||
std::string Interact::XmlPath() const { | ||
return GetModelPath("humanoid/interact/task.xml"); | ||
} | ||
std::string Interact::Name() const { return "Humanoid Interact"; } | ||
|
||
// ------------------ Residuals for humanoid contact keyframes task ------------ | ||
void Interact::ResidualFn::UpResidual(const mjModel* model, const mjData* data, | ||
double* residual, std::string&& name, | ||
int* counter) const { | ||
name.append("_up"); | ||
double* up_vector = SensorByName(model, data, name); | ||
residual[(*counter)++] = mju_abs(up_vector[2] - 1.0); | ||
} | ||
|
||
void Interact::ResidualFn::HeadHeightResidual(const mjModel* model, | ||
const mjData* data, | ||
double* residual, | ||
int* counter) const { | ||
double head_height = SensorByName(model, data, "head_position")[2]; | ||
residual[(*counter)++] = | ||
mju_abs(head_height - parameters_[kHeadHeightParameterIndex]); | ||
} | ||
|
||
void Interact::ResidualFn::TorsoHeightResidual(const mjModel* model, | ||
const mjData* data, | ||
double* residual, | ||
int* counter) const { | ||
double torso_height = SensorByName(model, data, "torso_position")[2]; | ||
residual[(*counter)++] = | ||
mju_abs(torso_height - parameters_[kTorsoHeightParameterIndex]); | ||
} | ||
|
||
void Interact::ResidualFn::KneeFeetXYResidual(const mjModel* model, | ||
const mjData* data, | ||
double* residual, | ||
int* counter) const { | ||
double* knee_right = SensorByName(model, data, "knee_right"); | ||
double* knee_left = SensorByName(model, data, "knee_left"); | ||
double* foot_right = SensorByName(model, data, "foot_right"); | ||
double* foot_left = SensorByName(model, data, "foot_left"); | ||
|
||
double knee_xy_avg[2] = {0.0}; | ||
mju_addTo(knee_xy_avg, knee_left, 2); | ||
mju_addTo(knee_xy_avg, knee_right, 2); | ||
mju_scl(knee_xy_avg, knee_xy_avg, 0.5, 2); | ||
|
||
double foot_xy_avg[2] = {0.0}; | ||
mju_addTo(foot_xy_avg, foot_left, 2); | ||
mju_addTo(foot_xy_avg, foot_right, 2); | ||
mju_scl(foot_xy_avg, foot_xy_avg, 0.5, 2); | ||
|
||
mju_subFrom(knee_xy_avg, foot_xy_avg, 2); | ||
residual[(*counter)++] = mju_norm(knee_xy_avg, 2); | ||
} | ||
|
||
void Interact::ResidualFn::COMFeetXYResidual(const mjModel* model, | ||
const mjData* data, | ||
double* residual, | ||
int* counter) const { | ||
double* foot_right = SensorByName(model, data, "foot_right"); | ||
double* foot_left = SensorByName(model, data, "foot_left"); | ||
double* com_position = SensorByName(model, data, "torso_subtreecom"); | ||
|
||
double foot_xy_avg[2] = {0.0}; | ||
mju_addTo(foot_xy_avg, foot_left, 2); | ||
mju_addTo(foot_xy_avg, foot_right, 2); | ||
mju_scl(foot_xy_avg, foot_xy_avg, 0.5, 2); | ||
|
||
mju_subFrom(com_position, foot_xy_avg, 2); | ||
residual[(*counter)++] = mju_norm(com_position, 2); | ||
} | ||
|
||
void Interact::ResidualFn::FacingDirectionResidual(const mjModel* model, | ||
const mjData* data, | ||
double* residual, | ||
int* counter) const { | ||
if (residual_keyframe_.facing_target.empty()) { | ||
residual[(*counter)++] = 0; | ||
return; | ||
} | ||
|
||
double* torso_forward = SensorByName(model, data, "torso_forward"); | ||
double* torso_position = mjpc::SensorByName(model, data, "torso_position"); | ||
double target[2] = {0.}; | ||
|
||
mju_sub(target, residual_keyframe_.facing_target.data(), torso_position, 2); | ||
mju_normalize(target, 2); | ||
mju_subFrom(target, torso_forward, 2); | ||
residual[(*counter)++] = mju_norm(target, 2); | ||
} | ||
|
||
void Interact::ResidualFn::ContactResidual(const mjModel* model, | ||
const mjData* data, double* residual, | ||
int* counter) const { | ||
for (int i = 0; i < kNumberOfContactPairsInteract; i++) { | ||
const ContactPair& contact = residual_keyframe_.contact_pairs[i]; | ||
if (contact.body1 != kNotSelectedInteract && | ||
contact.body2 != kNotSelectedInteract) { | ||
mjtNum tmp1[3]; | ||
mjtNum selected_global_pos1[3]; | ||
mju_mulMatVec(tmp1, data->xmat + 9 * contact.body1, contact.local_pos1, 3, | ||
3); | ||
mju_add3(selected_global_pos1, tmp1, data->xpos + 3 * contact.body1); | ||
|
||
mjtNum tmp2[3]; | ||
mjtNum selected_global_pos2[3]; | ||
mju_mulMatVec(tmp2, data->xmat + 9 * contact.body2, contact.local_pos2, 3, | ||
3); | ||
mju_add3(selected_global_pos2, tmp2, data->xpos + 3 * contact.body2); | ||
|
||
double dist[3] = {0.}; | ||
mju_addTo(dist, selected_global_pos1, 3); | ||
mju_subFrom(dist, selected_global_pos2, 3); | ||
residual[(*counter)++] = mju_abs(dist[0]); | ||
residual[(*counter)++] = mju_abs(dist[1]); | ||
residual[(*counter)++] = mju_abs(dist[2]); | ||
} else { | ||
for (int j = 0; j < 3; j++) residual[(*counter)++] = 0; | ||
} | ||
} | ||
} | ||
|
||
// ------------------ Residuals for humanoid interaction task ------------ | ||
// Number of residuals: 13 | ||
// Residual (0): Torso up | ||
// Residual (1): Pelvis up | ||
// Residual (2): Right foot up | ||
// Residual (3): Left foot up | ||
// Residual (4): Head height | ||
// Residual (5): Torso height | ||
// Residual (6): Knee feet xy-plane distance | ||
// Residual (7): COM feet xy-plane distance | ||
// Residual (8): Facing direction target xy-distance | ||
// Residual (9): Com Vel: should be 0 and equal feet average vel | ||
// Residual (10): Control: minimise control | ||
// Residual (11): Joint vel: minimise joint velocity | ||
// Residual (12): Contact: minimise distance between contact pairs | ||
// Number of parameters: 2 | ||
// Parameter (0): head_height_goal | ||
// Parameter (1): torso_height_goal | ||
// ---------------------------------------------------------------- | ||
void Interact::ResidualFn::Residual(const mjModel* model, const mjData* data, | ||
double* residual) const { | ||
int counter = 0; | ||
|
||
double* com_velocity = SensorByName(model, data, "torso_subtreelinvel"); | ||
|
||
// ----- task-specific residual terms ------ // | ||
UpResidual(model, data, residual, "torso", &counter); | ||
UpResidual(model, data, residual, "pelvis", &counter); | ||
UpResidual(model, data, residual, "foot_right", &counter); | ||
UpResidual(model, data, residual, "foot_left", &counter); | ||
HeadHeightResidual(model, data, residual, &counter); | ||
TorsoHeightResidual(model, data, residual, &counter); | ||
KneeFeetXYResidual(model, data, residual, &counter); | ||
COMFeetXYResidual(model, data, residual, &counter); | ||
FacingDirectionResidual(model, data, residual, &counter); | ||
|
||
// ----- COM xy velocity regularization ---- // | ||
mju_copy(&residual[counter], com_velocity, 2); | ||
counter += 2; | ||
|
||
// ----- joint velocity regularization ----- // | ||
mju_copy(residual + counter, data->qvel + 6, | ||
model->nv - (6 + kNumberOfFreeJoints * 6)); | ||
counter += model->nv - (6 + kNumberOfFreeJoints * 6); | ||
|
||
// ----- action regularization ------------- // | ||
mju_copy(&residual[counter], data->ctrl, model->nu); | ||
counter += model->nu; | ||
|
||
// ----- contact residual ------------------ // | ||
ContactResidual(model, data, residual, &counter); | ||
|
||
CheckSensorDim(model, counter); | ||
} | ||
|
||
// -------- Transition for interaction task -------- | ||
void Interact::TransitionLocked(mjModel* model, mjData* data) { | ||
// If the task mode is changed, sync it with the residual here | ||
if (residual_.current_task_mode_ != mode) { | ||
residual_.current_task_mode_ = (TaskMode)mode; | ||
weight = default_weights[residual_.current_task_mode_]; | ||
} | ||
} | ||
|
||
// draw task-related geometry in the scene | ||
void Interact::ModifyScene(const mjModel* model, const mjData* data, | ||
mjvScene* scene) const { | ||
// add visuals for the contact points | ||
for (int i = 0; i < kNumberOfContactPairsInteract; i++) { | ||
double sz[3] = {0.03}; | ||
const ContactPair contact = residual_.residual_keyframe_.contact_pairs[i]; | ||
if (contact.body1 != kNotSelectedInteract) { | ||
mjtNum global[3]; | ||
mju_mulMatVec(global, data->xmat + 9 * contact.body1, contact.local_pos1, | ||
3, 3); | ||
mju_addTo(global, data->xpos + 3 * contact.body1, 3); | ||
AddGeom(scene, mjGEOM_SPHERE, sz, global, nullptr, | ||
CONTACT_POINTS_COLOR[i]); | ||
} | ||
if (contact.body2 != kNotSelectedInteract) { | ||
mjtNum global[3]; | ||
mju_mulMatVec(global, data->xmat + 9 * contact.body2, contact.local_pos2, | ||
3, 3); | ||
mju_addTo(global, data->xpos + 3 * contact.body2, 3); | ||
AddGeom(scene, mjGEOM_SPHERE, sz, global, nullptr, | ||
CONTACT_POINTS_COLOR[i]); | ||
} | ||
} | ||
|
||
// add visuals for the facing direction | ||
if (!residual_.residual_keyframe_.facing_target.empty()) { | ||
double sz[3] = {0.02}; | ||
mjtNum pos[3] = {residual_.residual_keyframe_.facing_target[0], | ||
residual_.residual_keyframe_.facing_target[1], 0}; | ||
AddGeom(scene, mjGEOM_SPHERE, sz, pos, nullptr, FACING_DIRECTION_COLOR); | ||
} | ||
} | ||
|
||
} // namespace mjpc::humanoid |
Oops, something went wrong.