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.

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

followSpeed into timer #371

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
35 changes: 35 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,14 @@ The figure below illustrates this behavior using an example.
1. As the joystick remains at a positive value, the reference speed is incremented again.
1. However, it reaches the speed limit so in the next step it is not incremented even though the joystick still has a positive value.
1. Later, the joystick is set to a negative position for one time unit, making the reference speed to decrease as well.


# First line of work

## Seconde line with H2

### Third line wioth H3

**This is bold text**

~~Branch-B
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
<module>train-user</module>
</modules>


<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package hu.bme.mit.train.controller;

import java.util.Timer;
import java.util.TimerTask;

import hu.bme.mit.train.interfaces.TrainController;

public class TrainControllerImpl implements TrainController {
Expand All @@ -8,6 +11,20 @@ public class TrainControllerImpl implements TrainController {
private int referenceSpeed = 0;
private int speedLimit = 0;

TrainControllerImpl(){

Choose a reason for hiding this comment

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

Please comment what this does

Timer timer = new Timer();
timer.schedule(new TimerTask() {


//This calls the followSpeed in every 0,1 seconds
@Override
public void run() {
followSpeed();
}
}, 100);
}

@Override
public void followSpeed() {
if (referenceSpeed < 0) {
Expand Down Expand Up @@ -46,4 +63,8 @@ public void setJoystickPosition(int joystickPosition) {
this.step = joystickPosition;
}

public void emergencyBreaking(){
referenceSpeed = 0;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/controller/TrainControllerImpl.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ public interface TrainSensor {

void overrideSpeedLimit(int speedLimit);

void addToTapograf();

int getTapografSize();

}
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/home/cloud/Documents/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainSensor.java
/home/cloud/Documents/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainUser.java
/home/cloud/Documents/base/train-interfaces/src/main/java/hu/bme/mit/train/interfaces/TrainController.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,32 @@
import hu.bme.mit.train.interfaces.TrainSensor;
import hu.bme.mit.train.interfaces.TrainUser;

import com.google.common.collect.Table;
import java.util.Date;
import com.google.common.collect.HashBasedTable;
import java.lang.Integer;


public class TrainSensorImpl implements TrainSensor {

private TrainController controller;
private TrainUser user;
private int speedLimit = 5;
private Table<Date, Integer, Integer> tachograf = HashBasedTable.create();


public void addToTapograf(){
tachograf.put(new Date(), user.getJoystickPosition(), controller.getReferenceSpeed());
}

public int getTapografSize(){
return tachograf.size();
}

public TrainSensorImpl(TrainController controller, TrainUser user) {
this.controller = controller;
this.user = user;

}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ public class TrainSensorTest {

@Before
public void before() {
// TODO Add initializations

}

@Test
public void ThisIsAnExampleTestStub() {
// TODO Delete this and add test cases based on the issues
}
}
/* */
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/sensor/TrainSensorImpl.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-sensor/src/main/java/hu/bme/mit/train/sensor/TrainSensorImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/sensor/TrainSensorTest.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-sensor/src/test/java/hu/bme/mit/train/sensor/TrainSensorTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="hu.bme.mit.train.sensor.TrainSensorTest" time="0.004" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="java.vm.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Documents/base"/>
<property name="java.vm.vendor" value="Ubuntu"/>
<property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
<property name="path.separator" value=":"/>
<property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
<property name="sun.os.patch.level" value="unknown"/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/cloud/Documents/base"/>
<property name="java.vm.compressedOopsMode" value="32-bit"/>
<property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
<property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
<property name="java.library.path" value="/usr/java/packages/lib:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
<property name="maven.conf" value="/usr/share/maven/conf"/>
<property name="jdk.debug" value="release"/>
<property name="java.class.version" value="55.0"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="os.version" value="4.15.0-206-generic"/>
<property name="library.jansi.path" value="/usr/share/maven/lib/jansi-native"/>
<property name="user.home" value="/home/cloud"/>
<property name="user.timezone" value="Europe/Budapest"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
<property name="java.specification.version" value="11"/>
<property name="user.name" value="cloud"/>
<property name="java.class.path" value="/usr/share/maven/boot/plexus-classworlds-2.x.jar"/>
<property name="java.vm.specification.version" value="11"/>
<property name="sun.arch.data.model" value="64"/>
<property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher test"/>
<property name="java.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
<property name="user.language" value="en"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode, sharing"/>
<property name="java.version" value="11.0.18"/>
<property name="securerandom.source" value="file:/dev/./urandom"/>
<property name="java.vendor" value="Ubuntu"/>
<property name="maven.home" value="/usr/share/maven"/>
<property name="file.separator" value="/"/>
<property name="java.version.date" value="2023-01-17"/>
<property name="java.vendor.url.bug" value="https://bugs.launchpad.net/ubuntu/+source/openjdk-lts"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.endian" value="little"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="hu.bme.mit.train.sensor.TrainSensorTest" name="ThisIsAnExampleTestStub" time="0.004"/>
</testsuite>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: hu.bme.mit.train.sensor.TrainSensorTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.189 sec
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,21 @@ public void OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero() {
Assert.assertEquals(0, controller.getReferenceSpeed());
}

@Test
public void OverridingJoystickPositionToNegative() {
user.overrideJoystickPosition(5);
controller.followSpeed();
user.overrideJoystickPosition(-6);
controller.followSpeed();
Assert.assertEquals(0, controller.getReferenceSpeed());
}

@Test
public void Tachograph() {
sensor.addToTapograf();

Assert.assertEquals(1, sensor.getTapografSize());
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/system/TrainSystem.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/system/TrainSystemTest.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-system/src/test/java/hu/bme/mit/train/system/TrainSystemTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="4" failures="0" name="hu.bme.mit.train.system.TrainSystemTest" time="0.041" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="java.vm.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="maven.multiModuleProjectDirectory" value="/home/cloud/Documents/base"/>
<property name="java.vm.vendor" value="Ubuntu"/>
<property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="path.separator" value=":"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
<property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="unknown"/>
<property name="user.dir" value="/home/cloud/Documents/base"/>
<property name="java.vm.compressedOopsMode" value="32-bit"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="java.runtime.version" value="11.0.18+10-post-Ubuntu-0ubuntu118.04.1"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
<property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
<property name="java.library.path" value="/usr/java/packages/lib:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
<property name="maven.conf" value="/usr/share/maven/conf"/>
<property name="jdk.debug" value="release"/>
<property name="java.class.version" value="55.0"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="os.version" value="4.15.0-206-generic"/>
<property name="library.jansi.path" value="/usr/share/maven/lib/jansi-native"/>
<property name="user.home" value="/home/cloud"/>
<property name="user.timezone" value="Europe/Budapest"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
<property name="java.specification.version" value="11"/>
<property name="user.name" value="cloud"/>
<property name="java.class.path" value="/usr/share/maven/boot/plexus-classworlds-2.x.jar"/>
<property name="java.vm.specification.version" value="11"/>
<property name="sun.arch.data.model" value="64"/>
<property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher test"/>
<property name="java.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
<property name="user.language" value="en"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode, sharing"/>
<property name="java.version" value="11.0.18"/>
<property name="securerandom.source" value="file:/dev/./urandom"/>
<property name="java.vendor" value="Ubuntu"/>
<property name="maven.home" value="/usr/share/maven"/>
<property name="file.separator" value="/"/>
<property name="java.version.date" value="2023-01-17"/>
<property name="java.vendor.url.bug" value="https://bugs.launchpad.net/ubuntu/+source/openjdk-lts"/>
<property name="sun.cpu.endian" value="little"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPositionToNegative_SetsReferenceSpeedToZero" time="0.008"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="Tachograph" time="0.031"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPosition_IncreasesReferenceSpeed" time="0.001"/>
<testcase classname="hu.bme.mit.train.system.TrainSystemTest" name="OverridingJoystickPositionToNegative" time="0.001"/>
</testsuite>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: hu.bme.mit.train.system.TrainSystemTest
-------------------------------------------------------------------------------
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.146 sec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public class TrainUserImpl implements TrainUser {
private TrainController controller;
private int joystickPosition;



public TrainUserImpl(TrainController controller) {
this.controller = controller;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hu/bme/mit/train/user/TrainUserImpl.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/cloud/Documents/base/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java