Skip to content

Commit

Permalink
Minor changes to make demo smoother.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdelacroix committed Mar 28, 2014
1 parent 0dd65db commit df83be5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion +simiam/+controller/AOandGTG.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
obj = [email protected]('ao_and_gtg');
obj.calibrated = false;

obj.Kp = 4;
obj.Kp = 5;
obj.Ki = 0.01;
obj.Kd = 0.01;

Expand Down Expand Up @@ -106,6 +106,8 @@

% fprintf('(v,w) = (%0.4g,%0.4g)\n', v,w);

v = 0.25/(log(abs(w)+2)+1);

outputs.v = v;
outputs.w = w;
end
Expand Down
2 changes: 1 addition & 1 deletion +simiam/+controller/AvoidObstacles.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
obj = [email protected]('avoid_obstacles');
obj.calibrated = false;

obj.Kp = 4;
obj.Kp = 5;
obj.Ki = 0.01;
obj.Kd = 0.01;

Expand Down
4 changes: 2 additions & 2 deletions +simiam/+simulator/Simulator.m
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ function step(obj, src, event)
% split = max(obj.time_step,get(obj.clock, 'InstantPeriod'));
% end

% split = obj.time_step;
split = obj.time_step;
% fprintf('***TIMING***\nsimulator split: %0.3fs, %0.3fHz\n', split, 1/split);

tstart = tic;
% tstart = tic;
nRobots = length(obj.world.robots);
for k = 1:nRobots
robot_s = obj.world.robots.elementAt(k);
Expand Down

0 comments on commit df83be5

Please sign in to comment.