File tree Expand file tree Collapse file tree
main/kotlin/cz/vutbr/fit/interlockSim
test/kotlin/cz/vutbr/fit/interlockSim Expand file tree Collapse file tree Original file line number Diff line number Diff line change 99 */
1010package cz.vutbr.fit.interlockSim.context
1111
12+ import cz.vutbr.fit.interlockSim.domain.COMMON_MAX_SPEED
1213import cz.vutbr.fit.interlockSim.objects.cells.InOut
1314import cz.vutbr.fit.interlockSim.objects.core.Cell
1415import cz.vutbr.fit.interlockSim.objects.core.Cell.Segment
15- import cz.vutbr.fit.interlockSim.objects.core.PathElement
1616import cz.vutbr.fit.interlockSim.objects.core.StaticTrack
1717import cz.vutbr.fit.interlockSim.objects.tracks.TrackBlock
1818import cz.vutbr.fit.interlockSim.util.ExtendedUnorientedGraph
@@ -140,7 +140,7 @@ abstract class BaseContext<T : TrackBlock>(
140140 * Inherited from EditingContext interface.
141141 * Open to allow subclass override if needed.
142142 */
143- open var currentMaxSpeed: Double = cz.vutbr.fit.interlockSim.objects.core. PathElement . COMMON_MAX_SPEED
143+ open var currentMaxSpeed: Double = COMMON_MAX_SPEED
144144
145145 /* *
146146 * Current track length for new track elements.
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ package cz.vutbr.fit.interlockSim.objects.paths
1111
1212import cz.vutbr.fit.interlockSim.context.SimulationContext
1313import cz.vutbr.fit.interlockSim.context.SimulationContext.ReportType
14+ import cz.vutbr.fit.interlockSim.domain.MINIMAL_MAX_SPEED
1415import cz.vutbr.fit.interlockSim.exceptions.PathSeparatorChangeException
1516import cz.vutbr.fit.interlockSim.exceptions.TrackOperationException
1617import cz.vutbr.fit.interlockSim.exceptions.requireSimulation
@@ -298,7 +299,7 @@ abstract class AbstractPath protected constructor(
298299 }
299300 }
300301 context.report(" " , this , ReportType .PATH_SETTING )
301- requireSimulation(maxSpeed(sep) >= PathElement . MINIMAL_MAX_SPEED ) {
302+ requireSimulation(maxSpeed(sep) >= MINIMAL_MAX_SPEED ) {
302303 " Max speed must be at least MINIMAL_MAX_SPEED, got: ${maxSpeed(sep)} "
303304 }
304305 }
Original file line number Diff line number Diff line change 1010package cz.vutbr.fit.interlockSim.objects.tracks
1111
1212import cz.vutbr.fit.interlockSim.domain.MINIMAL_MAX_SPEED
13+ import cz.vutbr.fit.interlockSim.domain.MIN_TRACK_LENGTH
1314import cz.vutbr.fit.interlockSim.exceptions.requireSimulation
1415import cz.vutbr.fit.interlockSim.objects.core.PathSeparator
1516import cz.vutbr.fit.interlockSim.objects.core.StaticTrack
@@ -42,16 +43,13 @@ abstract class SimpleTrack(
4243 StaticTrack {
4344 companion object {
4445 private val logger = KotlinLogging .logger {}
45-
46- // Track minimum length constant
47- private const val MIN_LENGTH = StaticTrack .MIN_LENGTH
4846 }
4947
5048 private val speeds: IdentityHashMap <PathSeparator , Double > = IdentityHashMap ()
5149 private val ends: Array <PathSeparator >
5250
5351 init {
54- if (length < MIN_LENGTH || maxSpeed1 < MINIMAL_MAX_SPEED || maxSpeed2 < MINIMAL_MAX_SPEED ) {
52+ if (length < MIN_TRACK_LENGTH || maxSpeed1 < MINIMAL_MAX_SPEED || maxSpeed2 < MINIMAL_MAX_SPEED ) {
5553 throw IllegalArgumentException (" length or maxspeed is very small" )
5654 }
5755 ends = arrayOf(end1, end2)
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ import assertk.assertThat
1515import assertk.assertions.isEmpty
1616import assertk.assertions.isEqualTo
1717import assertk.assertions.isInstanceOf
18- import assertk.assertions.isNotNull
1918import assertk.assertions.isNull
2019import cz.vutbr.fit.interlockSim.context.navigation.PathReservationService
2120import cz.vutbr.fit.interlockSim.context.navigation.TrainNavigationService
Original file line number Diff line number Diff line change @@ -14,7 +14,6 @@ package cz.vutbr.fit.interlockSim.gui
1414import assertk.assertThat
1515import assertk.assertions.hasSize
1616import assertk.assertions.isEqualTo
17- import assertk.assertions.isNotNull
1817import org.junit.jupiter.api.BeforeEach
1918import org.junit.jupiter.api.DisplayName
2019import org.junit.jupiter.api.Test
You can’t perform that action at this time.
0 commit comments