Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capture evade experiments trial 2 #363

Merged
merged 14 commits into from
Jun 11, 2022
Merged

Capture evade experiments trial 2 #363

merged 14 commits into from
Jun 11, 2022

Conversation

trav-d13
Copy link
Collaborator

@trav-d13 trav-d13 commented Jun 8, 2022

closes #362

Implemented

  • Agent state table has been integrated into all agents within the nextState() method.
  • Both evade and capture experiments are working as expected.
  • Random Map generator has been integrated within the experiments
  • Experiments producing output to let the user know the experiment status

Still to Implement

  • Add the split Evasion Agents within the state table
  • Incorporate the new evasion \ capture agents produced

@trav-d13 trav-d13 added the Lvl 3 ~2 - 4hrs task label Jun 8, 2022
@trav-d13 trav-d13 requested a review from S010MON June 8, 2022 19:57
@trav-d13 trav-d13 self-assigned this Jun 8, 2022
@trav-d13 trav-d13 requested a review from MatthewFoster02 June 8, 2022 19:57
@trav-d13 trav-d13 marked this pull request as ready for review June 10, 2022 12:12
@trav-d13 trav-d13 requested review from laurajogi and Jolijn2020 June 10, 2022 12:36
Jolijn2020
Jolijn2020 previously approved these changes Jun 10, 2022
View reviewed changes
Copy link
Collaborator

@Jolijn2020 Jolijn2020 left a comment

Choose a reason for hiding this comment

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

looks good

Travisd13 added 2 commits June 10, 2022 20:34
@Travisd13
Merge remote-tracking branch 'origin/master' into capture_evade_exper…
56e2d40 
…iments_trial_2

# Conflicts:
#	src/main/java/app/model/agents/AgentImp.java
#	src/main/java/app/model/agents/AgentType.java
#	src/main/java/app/model/agents/Evasion/EvasionAgent.java
#	src/main/java/app/model/agents/TargetAgent.java
@Travisd13
"State table updates to include all new Evasion and Capture agents"
851033e
@trav-d13 trav-d13 dismissed stale reviews from MatthewFoster02 and Jolijn2020 via 851033e June 10, 2022 18:40
MatthewFoster02
MatthewFoster02 previously approved these changes Jun 10, 2022
View reviewed changes
Copy link
Collaborator

@MatthewFoster02 MatthewFoster02 left a comment

Choose a reason for hiding this comment

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

Re-approved

Jolijn2020
Jolijn2020 previously approved these changes Jun 10, 2022
View reviewed changes
Copy link
Collaborator

@Jolijn2020 Jolijn2020 left a comment

Choose a reason for hiding this comment

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

re-approved

@trav-d13 trav-d13 dismissed stale reviews from Jolijn2020 and MatthewFoster02 via 969ec1f June 11, 2022 11:09
@S010MON S010MON merged commit b716735 into master Jun 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatthewFoster02 MatthewFoster02 MatthewFoster02 approved these changes

@S010MON S010MON S010MON approved these changes

@Jolijn2020 Jolijn2020 Jolijn2020 left review comments

@laurajogi laurajogi Awaiting requested review from laurajogi

Assignees

@trav-d13 trav-d13

Labels
Lvl 3 ~2 - 4hrs task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@trav-d13 @S010MON @MatthewFoster02 @Jolijn2020 @Travisd13