passes all unit tests.

git-svn-id: https://svn.csail.mit.edu/locomotion/robotlib/trunk@4965 c9849af7-e679-4ec6-a44e-fc146a885bd3
vcmman · Jan 23, 2013 · 35a5dfe · 35a5dfe
1 parent 35be043
commit 35a5dfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/configure.m b/configure.m
@@ -69,7 +69,6 @@
 addpath([conf.root,'/thirdParty']);
 addpath([conf.root,'/thirdParty/path']);
 addpath([conf.root,'/thirdParty/spatial']);
-addpath([conf.root,'/thirdParty/graphviz2mat']);
 addpath([conf.root,'/thirdParty/cprintf']);
 
 % todo: setup java classpath (not hard to do it once... but how can I set

diff --git a/examples/ZMP/LinearInvertedPendulum2D.m b/examples/ZMP/LinearInvertedPendulum2D.m
@@ -59,8 +59,9 @@
     function runPassive
       r = LinearInvertedPendulum2D(1.055);
       v = r.constructVisualizer();
+      dZMP = setOutputFrame(ConstantTrajectory([0]),desiredZMP1D); 
       ytraj = r.simulate([0 3],[0;.1]);
-      v.playback(ytraj);
+      v.playback([ytraj;dZMP]);
     end
 
     function runLQR