Merge pull request RobotLocomotion#1057 from RussTedrake/clear_all_bug

work-around for `clear all` matlab bug.
vcmman · Apr 27, 2015 · b2e64aa · b2e64aa
2 parents ba0a6bd + f1ac571
commit b2e64aa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/systems/frames/CoordinateFrame.m b/systems/frames/CoordinateFrame.m
@@ -9,7 +9,6 @@
     dim=0;          % scalar dimension of this coordinate system
     transforms={};  % handles to CoordinateTransform objects
 
-    name_hash;      % unique hash of the string name
     coordinates={}; % list of coordinate names
 
     prefix;         % a vector character prefix used for the msspoly variables, or a vector of size dim listing prefixes for each variable
@@ -39,7 +38,6 @@
 
       typecheck(name,'char');
       obj.name = name;
-      obj.name_hash = java.lang.String(obj.name).hashCode();
 
       typecheck(dim,'double');
       sizecheck(dim,[1 1]);

diff --git a/util/getDrakePath.m b/util/getDrakePath.m
@@ -9,10 +9,6 @@
 persistent myroot;
 
 if (isempty(myroot))
-  known_file = which('LinearSystem');
-  if isempty(known_file)
-    error('Can''t find drake root.  Did you call addpath_drake?');
-  end
-  myroot = fileparts(fileparts(known_file));
+  myroot = fileparts(fileparts(which('getDrakePath')));
 end
 root = myroot;