diff --git a/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java b/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java index d29ead3c65b8eedd7f77716700fa49198a451ae4..25031df343bc88e13ce70a6628e4360eb53125fb 100755 --- a/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java +++ b/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java @@ -760,7 +760,7 @@ public class TML2UPPAAL { } public void makeLoss(String name) { - TraceManager.addDev("Makking loss"); + TraceManager.addDev("Making loss"); if (lossTemplate == null) { lossTemplate = new UPPAALTemplate(); lossTemplate.setName("LossManager__"); diff --git a/src/main/java/ui/window/JDialogUPPAALValidation.java b/src/main/java/ui/window/JDialogUPPAALValidation.java index 0f64ab0946f43ad92ac036ee09a9fbc5033744e2..48d60fabf44135bf068193ffa88de9e6d38bd2e5 100644 --- a/src/main/java/ui/window/JDialogUPPAALValidation.java +++ b/src/main/java/ui/window/JDialogUPPAALValidation.java @@ -599,7 +599,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti jta.append("Using default size"); } - TraceManager.addDev("spec=" + spec); + //TraceManager.addDev("spec=" + spec); } t = new Thread(this); diff --git a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java index 66fc79e8218e0e15796558d65aa032bfee824f60..88ff6e423f398981c5379817ef08494d11cb576f 100644 --- a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java +++ b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java @@ -235,6 +235,8 @@ public class AvatarExpressionTest { assertTrue(e12.buildExpression(block1)); AvatarExpressionSolver e13 = new AvatarExpressionSolver("(key1==false) and (key2==true)"); assertTrue(e13.buildExpression(block1)); + AvatarExpressionSolver e14 = new AvatarExpressionSolver("x-40<3"); + assertTrue(e14.buildExpression(block1)); assertTrue(e1.getResult(specBlock) == 15); assertTrue(e2.getResult(specBlock) == 1); assertTrue(e3.getResult(specBlock) == 0); @@ -248,6 +250,8 @@ public class AvatarExpressionTest { assertTrue(e11.getResult(attributes) == 5); assertTrue(e12.getResult(attributes) == 36); assertTrue(e13.getResult(attributes) == 1); + assertTrue(e14.getResult(attributes) == 1); + } @Test