diff --git a/README.md b/README.md index e26e034fc..79cd0af31 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,13 @@ To compile and run tests also execute: ``` ./gradlew test ``` +## | Tables | Are | Cool | +## | ------------- |:-------------:| -----:| +## | col 3 is | right-aligned | $1600 | +## | col 2 is | centered | $12 | +## | zebra stripes | are neat | $1 | + +## [I'm an inline-style link](https://www.google.com) ## Overview @@ -50,7 +57,8 @@ The application represents a simple train controller system with the following t Setting the reference speed of the train works in the following way. * The user can set the position of a joystick, which can be zero or a positive/negative number. -* In each time unit, the controller adds the position of the joystick to the current reference speed. Therefore the reference speed does not change if the position is zero, it is incremented if the position is positive and it is decremented if the position is negative. +* In each time unit, the controller adds the position of the joystick to the current reference speed. + Therefore the reference speed does not change if the position is zero, it is incremented if the position is positive and it is decremented if the position is negative. * After each change, the speed limit is checked and enforced. The figure below illustrates this behavior using an example. diff --git a/exit b/exit new file mode 100644 index 000000000..28ef01887 --- /dev/null +++ b/exit @@ -0,0 +1,77 @@ +commit deb65e016adf8a2e6fdfee788c47b1c594f96a88 (HEAD -> 4.6-Feladat, origin/4.6-Feladat) +Author: ZambellyMarton +Date: Mon Jun 5 16:28:10 2023 +0200 + + 4.6-Feladat implementálva + +commit 1a8f2ffd5d9f66e6ae713f8cfc0c12672c8c28f1 (origin/master, origin/HEAD, master) +Author: zambelly +Date: Sun Jun 4 21:09:02 2023 +0200 + + Markdown feldatok + +commit dda7f232ea91d15e2a9e8cc78fb73d7926169b3c +Author: Richárd Szabó +Date: Tue Mar 14 18:47:07 2023 +0100 + + Updated README for 2023 + +commit 7c1872428c80ac7b6ec8cb46bfc2148cd74646c1 +Author: Szabó Richárd +Date: Tue Feb 28 18:49:10 2023 +0100 + + Added maven files + +commit b74044cf56d108795afb21bdca966be368c629e2 +Author: Zoltan Szatmari +Date: Sun Feb 20 22:22:08 2022 +0100 + + Updated for GitHub workflows + +commit 2badaac5f79271a41ac6c0925f72a9924db6bfff +Author: Gabor Szarnyas +Date: Mon Mar 2 20:13:05 2020 +0100 + + Bump Gradle version to 6.2.1 + +commit b9c01be97b0fb134de01f7ef3f71e6568428b3f3 +Author: Zoltan Micskei +Date: Thu Jan 31 00:33:44 2019 +0100 + + Update README with Getting started + +commit 3d43ac417d53acc0413f04604363f1ab4a29f8c9 +Author: Gabor Szarnyas +Date: Mon Mar 13 08:39:14 2017 +0100 + + Update README + +commit a4d46b60c7a4880e0cd20a8150d8615dc93f8936 +Author: Dávid Honfi +Date: Sun Mar 12 21:24:10 2017 +0100 + + Added mockito to Gradle build + +commit 26b5c78451b1a7f5eb76c92d08710ab3269d0532 +Author: Hajdu Ákos +Date: Thu Mar 9 12:11:14 2017 +0100 + + Extended readme + +commit 0174157d9a581fbd466736ece14668e434dd14b3 +Author: Dávid Honfi +Date: Wed Mar 8 22:24:36 2017 +0100 + + Changes for testing lab + +commit 77f7fa5fe69591ac7eea4c2b8a7a377e6bc357ec +Author: Gabor Szarnyas +Date: Mon Mar 6 15:36:27 2017 +0100 + + Add .idea directory to gitignore + +commit 9b5d53c38d3032968a714d910f86fae5b55f10f2 +Author: Gabor Szarnyas +Date: Mon Feb 27 13:58:39 2017 +0100 + + Initial commit diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..7f5a1ef4a --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/controller/TrainControllerImpl.class diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..b13b01cc3 --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..248759f35 --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +hu/bme/mit/train/interfaces/TrainController.class +hu/bme/mit/train/interfaces/TrainSensor.class +hu/bme/mit/train/interfaces/TrainUser.class diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..ca4e03d48 --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/cloud/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java +/home/cloud/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java +/home/cloud/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java diff --git a/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java b/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java index 4a640d1dd..490b7ada5 100644 --- a/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java +++ b/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java @@ -9,12 +9,21 @@ public class TrainSensorImpl implements TrainSensor { private TrainController controller; private TrainUser user; private int speedLimit = 5; + private boolean IsBrakeOn = false; + private int CurrentSpeed = 100; + public TrainSensorImpl(TrainController controller, TrainUser user) { this.controller = controller; this.user = user; } + public int EmergencyBrake(boolean IsBrakeOn,int CurrentSpeed, int speedLimit){ + if (CurrentSpeed > speedLimit ) + {IsBrakeOn = true;} + return 0;} + + @Override public int getSpeedLimit() { return speedLimit; diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..5c6a37510 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/sensor/TrainSensorImpl.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..a99815748 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..0ad3f3de4 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/sensor/TrainSensorTest.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..e2a796968 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml new file mode 100644 index 000000000..2cea7d27c --- /dev/null +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt new file mode 100644 index 000000000..c148c3596 --- /dev/null +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.sensor.TrainSensorTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 sec diff --git a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java index 4ef42638b..9ac6b4b05 100644 --- a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java +++ b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java @@ -12,11 +12,14 @@ public class TrainSystem { private TrainController controller = new TrainControllerImpl(); private TrainUser user = new TrainUserImpl(controller); private TrainSensor sensor = new TrainSensorImpl(controller, user); + private boolean IsBrakeOn = false; + private int CurrentSpeed = 100; public TrainController getController() { return controller; } + public TrainSensor getSensor() { return sensor; } @@ -25,4 +28,12 @@ public TrainUser getUser() { return user; } + public int EmergencyBrake(boolean IsBrakeOn,int CurrentSpeed){ + if (CurrentSpeed > 160 ){ + IsBrakeOn = true; + } + return 0; + } + } + diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..104d0eff5 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/system/TrainSystem.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..a872c23b6 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..f347beb05 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/system/TrainSystemTest.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..656c56f34 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml new file mode 100644 index 000000000..847420001 --- /dev/null +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt new file mode 100644 index 000000000..0ab8802f2 --- /dev/null +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.system.TrainSystemTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.129 sec diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..f84f69174 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu/bme/mit/train/user/TrainUserImpl.class diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..8cd6208d2 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/cloud/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java