Commit fc261786 authored by apvrille's avatar apvrille
Browse files

Resolving bug on transformation between avatar graphical guard and textual guards

parent 594f9dec
......@@ -177,7 +177,7 @@ public abstract class AvatarGuard {
}
}
for (String delim: new String[] {"==", "!=", "<", ">"}) {
for (String delim: new String[] {"==", "!=", "<=", ">=", "<", ">"}) {
int indexBinaryOp = sane.indexOf (delim);
if (indexBinaryOp != -1) {
AvatarTerm firstTerm = AvatarTerm.createFromString (block, sane.substring (0, indexBinaryOp));
......
......@@ -98,7 +98,7 @@ public class TMAP2Network {
// Connect channels to the NoC
// A bridge is put with the same position as the router as to allow classical paths not to use the router
......
......@@ -1574,7 +1574,9 @@ public class AvatarDesignPanelTranslator {
final AvatarSMDConnector connector) {
final AvatarStateMachineOwner block = transition.getBlock();
final String guardStr = modifyString(connector.getEffectiveGuard());
TraceManager.addDev("Effective guard:" + guardStr);
final AvatarGuard guard = AvatarGuard.createFromString(block, guardStr);
TraceManager.addDev("Avatarguard:" + guard);
final int error;
if (guard.isElseGuard()) {
......
......@@ -458,9 +458,13 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
@Override
public boolean hasAnUpdateOnPointedComponent() {
int index = getPointedExpressionOrder();
//TraceManager.addDev("CurrentIndex: " + highlightedExpr + " newIndex:" + index);
Integer indexI = getPointedExpressionOrder();
if (indexI == null) {
return false;
}
int index = indexI.intValue();
//TraceManager.addDev("CurrentIndex: " + highlightedExpr + " newIndex:" + index);
return index != highlightedExpr;
//return true;
......
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