summaryrefslogtreecommitdiff
path: root/LocomotorPrimitivesController.h
diff options
context:
space:
mode:
Diffstat (limited to 'LocomotorPrimitivesController.h')
-rw-r--r--LocomotorPrimitivesController.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/LocomotorPrimitivesController.h b/LocomotorPrimitivesController.h
index 0760459..6c52fda 100644
--- a/LocomotorPrimitivesController.h
+++ b/LocomotorPrimitivesController.h
@@ -1,7 +1,6 @@
#ifndef LOCOMOTORPRIMITIVES_CONTROLLER_H_
#define LOCOMOTORPRIMITIVES_CONTROLLER_H_
-#include <map>
#include <OpenSim/OpenSim.h>
#include "MuscleEMGProfile.h"
@@ -9,14 +8,14 @@ class LocomotorPrimitivesController : public OpenSim::Controller {
OpenSim_DECLARE_CONCRETE_OBJECT(LocomotorPrimitivesController, OpenSim::Controller);
public:
- LocomotorPrimitivesController(double alpha) : OpenSim::Controller(), _alpha(alpha) { }
+ LocomotorPrimitivesController(OpenSim::Storage act, double alpha) : OpenSim::Controller(), _act(act), _alpha(alpha) { }
int loadCsvData(const std::string &muscleName, const std::string &file);
void computeControls(const SimTK::State &s, SimTK::Vector &controls) const;
private:
double _alpha;
- std::vector<MuscleEMGProfile> _act;
+ OpenSim::Storage _act;
};
#endif /* LOCOMOTORPRIMITIVES_CONTROLLER_H_ */