Skip to content

Morph#22

Open
nicolawern wants to merge 12 commits into
masterfrom
morph
Open

Morph#22
nicolawern wants to merge 12 commits into
masterfrom
morph

Conversation

@nicolawern
Copy link
Copy Markdown
Collaborator

adding rogue deconfliction

% Reserve the trajectory
%timerVal = tic;
[ok, res_ids, res_toa_s] = ...
obj.lbsd.reserveLBSDTrajectory(lane_ids, uas_i.id, toa_s, ...
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nicolawern I think this code is still calling my reservation method, should it be commented out?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is still using your reservations which through all my tests produced the same result - I ran out of time to modify the reservations struct Tom uses to overwrite yours so I was just using a check to verify they were the same. Happy to work on this now

Comment thread @Sim/initializeUASTrajTch.m Outdated
end
% Generate a random request time

%I dont think request time is possible in rogue - this
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right

%todo will flight plan be empty if can't be scheduled?
%when I was running Tom's code it would throw and error and
%break
if ~isempty(flight_plan)
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally all this stuff would be in the LBSD class so we can call reserveLBSDTrajectoryTch (or something like that) and it will have the same signature as reserveLBSDTrajectory

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants