Commit 389afc2a authored by Matias Richart's avatar Matias Richart
Browse files

Correct bugs in fAnd

parent 2a534fca
......@@ -99,7 +99,7 @@ local function fst_step()
i_event=i_event+1
current_state = transition.new
print (current_state, #fsm[current_state], #ret_call, is_accept[current_state], #fsm[current_state]==0)
print ("NEW STATE:", current_state, "#TRANS:", #fsm[current_state], "#RETS:", #ret_call, "ACCEPT:", is_accept[current_state], "FINAL:", #fsm[current_state]==0)
return ret_call, is_accept[current_state], #fsm[current_state]==0
end
......
......@@ -561,7 +561,7 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lr)))" + ", ");
}
else{
out = out.concat("functions." + functionName + ", ");
out = out.concat("functions." + functionName + "(lr), ");
}
}
ActionTf function = (ActionTf) rateIt.next();
......@@ -570,11 +570,11 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lr)))");
}
else{
out = out.concat("functions." + functionName);
out = out.concat("functions." + functionName + "(lr)");
}
size = compositeActionsRate.size();
for (int i=0; i<size-1; i++){
out = out.concat(",lr)");
out = out.concat(")");
}
out = out.concat("\n");
......@@ -590,7 +590,7 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lp)))" + ", ");
}
else{
out = out.concat("functions." + functionName + ", ");
out = out.concat("functions." + functionName + "(lp), ");
}
}
function = (ActionTf) powerIt.next();
......@@ -599,11 +599,11 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lp)))");
}
else{
out = out.concat("functions." + functionName);
out = out.concat("functions." + functionName + "(lp)");
}
size = compositeActionsPower.size();
for (int i=0; i<size-1; i++){
out = out.concat(",lp)");
out = out.concat(")");
}
out = out.concat("\n");
out = out.concat("\t\t\tif (retRate <= retPower) and (retRate > retMax) then\n" +
......@@ -638,7 +638,7 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lr)))" + ", ");
}
else{
out = out.concat("functions." + functionName + ", ");
out = out.concat("functions." + functionName + "(lr), ");
}
}
ActionTf function = (ActionTf) rateIt.next();
......@@ -647,11 +647,11 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lr)))");
}
else{
out = out.concat("functions." + functionName);
out = out.concat("functions." + functionName + "(lr)");
}
size = compositeActionsRate.size();
for (int i=0; i<size-1; i++){
out = out.concat(",lr)");
out = out.concat(")");
}
out = out.concat("\n");
out = out.concat("\t\tif ret > retMax then\n" +
......@@ -679,7 +679,7 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lp)))" + ", ");
}
else{
out = out.concat("functions." + functionName + ", ");
out = out.concat("functions." + functionName + "(lp), ");
}
}
ActionTf function = (ActionTf) powerIt.next();
......@@ -688,11 +688,11 @@ public class LupaExporterRatePower {
out = out.concat("(1-(functions." + functionName(function.not()) + "(lp)))");
}
else{
out = out.concat("functions." + functionName);
out = out.concat("functions." + functionName + "(lp)");
}
size = compositeActionsPower.size();
for (int i=0; i<size-1; i++){
out = out.concat(",lp)");
out = out.concat(")");
}
out = out.concat("\n");
out = out.concat("\t\tif ret > retMax then\n" +
......
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