summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2012-12-05 21:18:46 +0100
committerTobias Klauser <tklauser@distanz.ch>2012-12-05 21:18:46 +0100
commit3b3211252915a22fa82a794e449d1f6000e8c5e5 (patch)
tree76a8f207076cb75d5ce7b662766eeeba7a64c393
parentad6a598de4025321a5227edf2a676c0f3397927c (diff)
Move data files to own directory
-rw-r--r--LocomotorPrimitives.cpp2
-rw-r--r--LocomotorPrimitivesController.cpp2
-rw-r--r--MuscleEMGProfile.h2
-rw-r--r--data/adults_es_r.csv (renamed from adults_es_r.csv)0
4 files changed, 3 insertions, 3 deletions
diff --git a/LocomotorPrimitives.cpp b/LocomotorPrimitives.cpp
index ea5f247..af1983a 100644
--- a/LocomotorPrimitives.cpp
+++ b/LocomotorPrimitives.cpp
@@ -24,7 +24,7 @@ static void constructModel(OpenSim::Model &model)
// Define controller for the model
LocomotorPrimitivesController *control = new LocomotorPrimitivesController(0.01);
- control->loadCsvData("es_r", "../../adults_es_r.csv");
+ control->loadCsvData("es_r", "../../data/adults_es_r.csv");
control->setActuators(model.updActuators());
model.addController(control);
diff --git a/LocomotorPrimitivesController.cpp b/LocomotorPrimitivesController.cpp
index 381e21f..84b6187 100644
--- a/LocomotorPrimitivesController.cpp
+++ b/LocomotorPrimitivesController.cpp
@@ -61,7 +61,7 @@ void LocomotorPrimitivesController::computeControls(const SimTK::State &s, SimTK
for (std::vector<MuscleEMGProfile>::const_iterator it = _act.begin(); it != _act.end(); ++it) {
MuscleEMGProfile p = *it;
- std::cout << " " << p.getName() << "(" << p.getIdx() << "/" << p.getCapacity() << ")" << std::endl;
+ //std::cout << " " << p.getName() << "(" << p.getIdx() << "/" << p.getCapacity() << ")" << std::endl;
}
//const OpenSim::Muscle *rectfem = dynamic_cast<const OpenSim::Muscle *>(&getActuatorSet().get("bifemlh_r"));
diff --git a/MuscleEMGProfile.h b/MuscleEMGProfile.h
index 2d31f27..2783b26 100644
--- a/MuscleEMGProfile.h
+++ b/MuscleEMGProfile.h
@@ -26,7 +26,7 @@ public:
}
unsigned getIdx() { return _x.size(); }
- unsigned getCapacity() { return _x.max_size(); }
+ unsigned getCapacity() { return _x.capacity(); }
const std::string &getName() { return _name; }
void addData(double x, double y);
diff --git a/adults_es_r.csv b/data/adults_es_r.csv
index 2481326..2481326 100644
--- a/adults_es_r.csv
+++ b/data/adults_es_r.csv