Skip to content
Snippets Groups Projects
Commit ba3ebc4f authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Update on invariants after debugging

parent 45d32064
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Makefile
+ 2
− 3
View file @ ba3ebc4f
...@@ -14,7 +14,7 @@ GZIP = gzip -9 -f ...@@ -14,7 +14,7 @@ GZIP = gzip -9 -f
DEBUG = -g DEBUG = -g
CLASSPATH = -classpath CLASSPATH = -classpath
CLASSPATH = -sourcepath CLASSPATH = -sourcepath
PACKAGE = avatartranslator avatartranslator/toexecutable avatartranslator/directsimulation avatartranslator/tocppsim avatartranslator/touppaal avatartranslator/toturtle avatartranslator/toproverif avatartranslator/totpn automata compiler/tmlparser vcd nc ddtranslator launcher myutil tpndescription sddescription sdtranslator tepe translator tmltranslator tmltranslator/toautomata tmltranslator/tosystemc tmltranslator/tomappingsystemc tmltranslator/tomappingsystemc2 tmltranslator/touppaal tmltranslator/toturtle translator/tojava translator/tosimujava translator/totpn translator/touppaal ui ui/avatarbd ui/avatarsmd ui/avatarrd ui/avatarpd ui/avatarcd ui/avatarad ui/ad ui/cd ui/oscd ui/osad ui/dd ui/ebrdd ui/file ui/graph ui/iod ui/ncdd ui/procsd ui/prosmdui/prosmd/util ui/tmlad ui/tmlcd ui/tmldd ui/tmlcomp ui/req ui/sd ui/tree ui/ucd ui/window tmltranslator tmltranslator/toturtle req/ebrdd tmltranslator/tosystemc tmatrix proverifspec uppaaldesc fr/inria/oasis/vercors/cttool/model remotesimulation frompipe/ PACKAGE = avatartranslator avatartranslator/toexecutable avatartranslator/directsimulation avatartranslator/tocppsim avatartranslator/touppaal avatartranslator/toturtle avatartranslator/toproverif avatartranslator/totpn automata compiler/tmlparser vcd nc ddtranslator launcher myutil tpndescription sddescription sdtranslator tepe translator tmltranslator tmltranslator/toautomata tmltranslator/tosystemc tmltranslator/tomappingsystemc tmltranslator/tomappingsystemc2 tmltranslator/touppaal tmltranslator/toturtle translator/tojava translator/tosimujava translator/totpn translator/touppaal ui ui/avatarbd ui/avatarsmd ui/avatarrd ui/avatarpd ui/avatarcd ui/avatarad ui/ad ui/cd ui/oscd ui/osad ui/dd ui/ebrdd ui/file ui/graph ui/iod ui/ncdd ui/procsd ui/prosmdui/prosmd/util ui/tmlad ui/tmlcd ui/tmldd ui/tmlcomp ui/req ui/sd ui/tree ui/ucd ui/window tmltranslator tmltranslator/toturtle req/ebrdd tmltranslator/tosystemc tmatrix proverifspec uppaaldesc fr/inria/oasis/vercors/cttool/model remotesimulation
BUILDER = builder.jar BUILDER = builder.jar
BUILD_INFO = build.txt BUILD_INFO = build.txt
BUILD_TO_MODIFY = src/ui/DefaultText.java BUILD_TO_MODIFY = src/ui/DefaultText.java
...@@ -100,8 +100,7 @@ basic: ...@@ -100,8 +100,7 @@ basic:
ttooljar_std: ttooljar_std:
rm -f $(TTOOL_BIN)/$(TTOOL_BINARY) rm -f $(TTOOL_BIN)/$(TTOOL_BINARY)
cp $(TTOOL_SRC)/ui/images/$(STD_LOGO) $(TTOOL_SRC)/ui/images/$(LOGO) cp $(TTOOL_SRC)/ui/images/$(STD_LOGO) $(TTOOL_SRC)/ui/images/$(LOGO)
cd $(TTOOL_SRC); $(JAR) cmf $(TTOOL_JAR_TXT) $(TTOOL_BIN)/$(TTOOL_BINARY) Main.class vcd/*.class avatartranslator/*.class avatartranslator/toexecutable/*.class avatartranslator/directsimulation/*.class avatartranslator/touppaal/*.class avatartranslator/toproverif/*.class avatartranslator/totpn/* avatartranslator/*.class avatartranslator/toturtle/*.java automata/*.class compiler/tmlparser/*.class nc/*.class tepe/*.class tmltranslator/*.class tmltranslator/toautomata/*.class tmatrix/*.class tmltranslator/toturtle/*.class tmltranslator/touppaal/*.class tmltranslator/tosystemc/*.class tmltranslator/tomappingsystemc/*.class tmltranslator/tomappingsystemc2/*.class tpndescription/*.class ddtranslator/*.class launcher/*.class myutil/*.class sddescription/*.class sdtranslator/*.class translator/*.class translator/tojava/*.class translator/tosimujava/*.class translator/touppaal/*.class translator/totpn/*.class req/ebrdd/*.java ui/*.class ui/*/*.class ui/*/*/*.class proverifspec/*.class uppaaldesc/*.class ui/images/*.* ui/images/toolbarButtonGraphics/general/*.gif ui/images/toolbarButtonGraphics/media/*.gif $(TTOOL_BIN)/$(LAUNCHER_BINARY) RTLLauncher.class launcher/*.class fr/inria/oasis/vercors/cttool/model/*.class remotesimulation/*.class frompipe/*.class cd $(TTOOL_SRC); $(JAR) cmf $(TTOOL_JAR_TXT) $(TTOOL_BIN)/$(TTOOL_BINARY) Main.class vcd/*.class avatartranslator/*.class avatartranslator/toexecutable/*.class avatartranslator/directsimulation/*.class avatartranslator/touppaal/*.class avatartranslator/toproverif/*.class avatartranslator/totpn/* avatartranslator/*.class avatartranslator/toturtle/*.java automata/*.class compiler/tmlparser/*.class nc/*.class tepe/*.class tmltranslator/*.class tmltranslator/toautomata/*.class tmatrix/*.class tmltranslator/toturtle/*.class tmltranslator/touppaal/*.class tmltranslator/tosystemc/*.class tmltranslator/tomappingsystemc/*.class tmltranslator/tomappingsystemc2/*.class tpndescription/*.class ddtranslator/*.class launcher/*.class myutil/*.class sddescription/*.class sdtranslator/*.class translator/*.class translator/tojava/*.class translator/tosimujava/*.class translator/touppaal/*.class translator/totpn/*.class req/ebrdd/*.java ui/*.class ui/*/*.class ui/*/*/*.class proverifspec/*.class uppaaldesc/*.class ui/images/*.* ui/images/toolbarButtonGraphics/general/*.gif ui/images/toolbarButtonGraphics/media/*.gif $(TTOOL_BIN)/$(LAUNCHER_BINARY) RTLLauncher.class launcher/*.class fr/inria/oasis/vercors/cttool/model/*.class remotesimulation/*.class
launcher: launcher:
rm -f $(TTOOL_BIN)/$(LAUNCHER_BINARY) rm -f $(TTOOL_BIN)/$(LAUNCHER_BINARY)
......
oldsrc/frompipe/InvariantAnalysis.java 0 → 100644
+ 896
− 0
View file @ ba3ebc4f
This diff is collapsed.
oldsrc/frompipe/Matrix.java 0 → 100644
+ 1387
− 0
View file @ ba3ebc4f
This diff is collapsed.
src/ui/window/JDialogInvariantAnalysis.java
+ 5
− 5
View file @ ba3ebc4f
...@@ -60,7 +60,7 @@ import tpndescription.*; ...@@ -60,7 +60,7 @@ import tpndescription.*;
import ui.*; import ui.*;
import ui.avatarsmd.*; import ui.avatarsmd.*;
import launcher.*; import launcher.*;
import frompipe.*; //import frompipe.*;
public class JDialogInvariantAnalysis extends javax.swing.JDialog implements ActionListener, Runnable { public class JDialogInvariantAnalysis extends javax.swing.JDialog implements ActionListener, Runnable {
...@@ -140,12 +140,12 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act ...@@ -140,12 +140,12 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
farkasButton = new JRadioButton("Farkas algorithm"); farkasButton = new JRadioButton("Farkas algorithm");
radioButtonsForAlgo.add(farkasButton, BorderLayout.NORTH); radioButtonsForAlgo.add(farkasButton, BorderLayout.NORTH);
PIPEButton = new JRadioButton("PIPE algorithm"); PIPEButton = new JRadioButton("PIPE algorithm");
radioButtonsForAlgo.add(PIPEButton, BorderLayout.SOUTH); //radioButtonsForAlgo.add(PIPEButton, BorderLayout.SOUTH);
panelCheck.add(radioButtonsForAlgo, BorderLayout.SOUTH); panelCheck.add(radioButtonsForAlgo, BorderLayout.SOUTH);
ButtonGroup group = new ButtonGroup(); ButtonGroup group = new ButtonGroup();
group.add(farkasButton); group.add(farkasButton);
group.add(PIPEButton); //group.add(PIPEButton);
if (FARKAS_SELECTED) { if (FARKAS_SELECTED) {
farkasButton.setSelected(true); farkasButton.setSelected(true);
} else { } else {
...@@ -268,7 +268,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act ...@@ -268,7 +268,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
public void pipeInvariants(TPN tpn, IntMatrix im) throws InterruptedException { public void pipeInvariants(TPN tpn, IntMatrix im) throws InterruptedException {
String[] elts; /*String[] elts;
mgui.gtm.clearInvariants(); mgui.gtm.clearInvariants();
...@@ -461,7 +461,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act ...@@ -461,7 +461,7 @@ public class JDialogInvariantAnalysis extends javax.swing.JDialog implements Act
jtainvariants.append("Ignored invariant: " + inv + "\n"); jtainvariants.append("Ignored invariant: " + inv + "\n");
ignored ++; ignored ++;
} }
} }*/
} }
public void farkasInvariants(IntMatrix im) throws InterruptedException { public void farkasInvariants(IntMatrix im) throws InterruptedException {
......
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