Commit efdb6b73 authored by Ievgen Strepkov's avatar Ievgen Strepkov
Browse files

Get rid off degree sign

parent 94261220
......@@ -10,6 +10,14 @@ import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.Expanded
public class SimulatorTSTest extends AbstractSymtab{
@Test
public void resolveMainController() {
TaggingResolver symtab = createSymTabAndTaggingResolver("src/test/resources");
ExpandedComponentInstanceSymbol instanceSymbol = symtab.<ExpandedComponentInstanceSymbol>resolve("simulator.mainController",
ExpandedComponentInstanceSymbol.KIND).orElse(null);
Assert.assertNotNull(instanceSymbol);
}
@Test
public void resolveModelDoorStatus() {
......@@ -56,9 +64,8 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
//Does not work in maven for some reason
@Ignore
@Test
@Ignore
public void resolveModel() {
TaggingResolver symtab = createSymTabAndTaggingResolver("src/test/resources");
ExpandedComponentInstanceSymbol instanceSymbol = symtab.<ExpandedComponentInstanceSymbol>resolve("simulatorts.visualization.main.sDCS",
......@@ -76,9 +83,8 @@ public class SimulatorTSTest extends AbstractSymtab{
Assert.assertNotNull(instanceSymbol);
}
//Does not work in maven for some reason
@Ignore
@Test
@Ignore
public void resolveModelsSteeringControl() {
TaggingResolver symtab = createSymTabAndTaggingResolver("src/test/resources");
ExpandedComponentInstanceSymbol instanceSymbol = symtab.<ExpandedComponentInstanceSymbol>resolve("simulatorts.visualization.movement.steeringControl",
......
......@@ -20,7 +20,7 @@ component MainController{
in Q y,
out Q(-2m/s^2:2m/s^2) acceleration,
out Q(-180°:180°) steering,
out Q(-180:180) steering,
out B status;
instance SteeringControl steeringControl;
......
......@@ -9,7 +9,7 @@ component SteeringControl {
in Q(0m:200m) slb, //sideleftback
in Q(0m:200m) srf, //siderightfront
in Q(0m:200m) srb, //siderightback
out Q(-180°:180°) steering; //out angle
out Q(-180:180) steering; //out angle
implementation Math{
......@@ -20,21 +20,21 @@ component SteeringControl {
B resComp3;
if (comp3)
resComp3 = -1°;
resComp3 = -1;
else
resComp3 = 0°;
resComp3 = 0;
end
B resComp2;
if (comp2)
resComp2 = 5°;
resComp2 = 5;
else
resComp2 = resComp3;
end
if (comp1)
steering = -5°;
steering = -5;
else
steering = resComp2;
end
......
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