Traffic lights#10
Open
Inspiron17R wants to merge 23 commits intomasterfrom
Open
Conversation
# Conflicts: # simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/links/TrafficLight.java # simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/links/TrafficLightInSet.java
…he same junction.
TrafficLightSet class: added two interior lists for two types of lights at a one junction.
… Rule for the set
Conflicts: simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/GraphTools.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/descriptors/TrafficLightsInSetRule.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/links/TrafficLight.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/links/TrafficLightInSet.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/trafficLight/TrafficLight.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/trafficLight/TrafficLightController.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/trafficLight/TrafficLightInSet.java simulator/src/main/java/kcl/teamIndexZero/traffic/simulator/data/trafficLight/TrafficLightSet.java simulator/src/test/java/kcl/teamIndexZero/traffic/simulator/data/GraphToolsTest.java Ctrl+Alt+L the traffic light code (indentation and spacing)
| /** | ||
| * Adds rule to the one traffic light set | ||
| */ | ||
| public void addRule(TrafficLightsInSetRule rule){ |
Member
There was a problem hiding this comment.
So how are the TrafficLightInSet linked together so that they work synchronously?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Final improvements in Traffic Light classes