Commit 77f2a32c authored by Ievgen Strepkov's avatar Ievgen Strepkov
Browse files

Updated the package value in the models

parent cd65bb8c
......@@ -36,7 +36,6 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
@Ignore
@Test
public void resolveModelBrakeLightsControl() {
......@@ -46,7 +45,6 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
@Ignore
@Test
public void resolveModelIndicatorStatus() {
......@@ -56,7 +54,6 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
@Ignore
@Test
public void resolveModelsLightTimer() {
......@@ -94,4 +91,4 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
}
\ No newline at end of file
}
\ No newline at end of file
package visualization.doors;
package doors;
component DoorStatus {
port
......
package visualization.feature;
package feature;
component GameOverTrigger {
port
......
package visualization.lights;
package lights;
component BrakeLightsControl {
port
......
package visualization.lights;
package lights;
component IndicatorStatus {
port
......
package visualization.lights;
package lights;
component LightTimer {
port
......
package visualization.main;
package main;
import visualization.basics.*;
import visualization.doors.*;
import visualization.lights.*;
import visualization.movement.*;
import visualization.feature.*;
import doors.*;
import lights.*;
import movement.*;
import feature.*;
component SDCS {
port
......
package visualization.movement;
package movement;
component ConstantVelocity {
port
in (0km/h : 250km/h) velocity,
in (0s:1000s) time,
out (-2m/s^2:2m/s^2) acceleration;
in (0s : 1000s) time,
out (-2 m/s^2 : 2 m/s^2) acceleration;
implementation Math {
......
package visualization.movement;
package movement;
component SteeringControl {
port
......@@ -13,14 +13,14 @@ component SteeringControl {
implementation Math {
(0m:2m) threshold = 0.1m;
(-2m:0m) thresholdN = -0.1m;
Q(0m:2m) threshold = 0.1m;
Q(-2m:0m) thresholdN = -0.1m;
B comp1 = (((fl-fr) > threshold) && ((slf-slb) > threshold)) && ((srb-srf) > threshold);
B comp2 = (((fl-fr) < thresholdN) && ((slf-slb) < thresholdN)) && ((srb-srf) < thresholdN);
B comp3 = (slf<slb) && (srf<srb);
(0°:-1°) resComp3 = 0°;
Q(0°:-1°) resComp3 = 0°;
if comp3 {
resComp3 = -1°;
......@@ -31,7 +31,7 @@ component SteeringControl {
}
end
(5°:-1°) resComp2 = 0°;
Q(5°:-1°) resComp2 = 0°;
if comp2 {
resComp2 = 5°;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment