← Back to branch summary

~yrke/tapaal/tapaaldev-fix1828782

« back to all changes in this revision

Viewing changes to src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java

  • Committer: Kenneth Yrke Jørgensen
  • Date: 2019-05-03 10:22:45 UTC
  • mfrom: (998.2.11 tapaal)
  • Revision ID: kenneth@yrke.dk-20190503102245-5qiefwt8cni2b2ir
Merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java
135
135
                        resetVerifytapn();
136
136
                        return false;
137
137
                }
138
 
                
139
 
                String[] version = getVersion().split("\\.");
140
 
                String[] targetversion = Pipe.verifytapnMinRev.split("\\.");
141
 
                
142
 
                for(int i = 0; i < targetversion.length; i++){
143
 
                        if(version.length < i+1)        version[i] = "0";
144
 
                        int diff = Integer.parseInt(version[i]) - Integer.parseInt(targetversion[i]);
145
 
                        if(diff > 0){
146
 
                                break;
147
 
                        }else if(diff < 0){
148
 
                                return false;
 
138
 
 
139
                if (getVersion() != null) {
 
140
                        String[] version = getVersion().split("\\.");
 
141
                        String[] targetversion = Pipe.verifytapnMinRev.split("\\.");
 
142
 
 
143
                        for (int i = 0; i < targetversion.length; i++) {
 
144
                                if (version.length < i + 1) version[i] = "0";
 
145
                                int diff = Integer.parseInt(version[i]) - Integer.parseInt(targetversion[i]);
 
146
                                if (diff > 0) {
 
147
                                        break;
 
148
                                } else if (diff < 0) {
 
149
                                        return false;
 
150
                                }
149
151
                        }
 
152
 
 
153
                        return true;
 
154
                } else {
 
155
                        return false;
150
156
                }
151
 
                
152
 
                return true;
153
157
        }
154
158
 
155
159
        private void resetVerifytapn() {
205
209
        }
206
210
        
207
211
        public static boolean trySetup() {
208
 
                
209
 
                String verifytapn = null;
210
 
                
211
 
                //If env is set, it overwrites the value
212
 
                verifytapn = System.getenv("verifytapn");
213
 
                if (verifytapn != null && !verifytapn.isEmpty()) {
214
 
                        if (new File(verifytapn).exists()){
 
212
 
 
213
 
 
214
                        String verifytapn = null;
 
215
 
 
216
                        //If env is set, it overwrites the value
 
217
                        verifytapn = System.getenv("verifytapn");
 
218
                        if (verifytapn != null && !verifytapn.isEmpty()) {
 
219
                                if (new File(verifytapn).exists()){
 
220
                                        verifytapnpath = verifytapn;
 
221
                                        VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
 
222
                                        if(v.isCorrectVersion()){
 
223
                                                return true;
 
224
                                        }else{
 
225
                                                verifytapn = null;
 
226
                                                verifytapnpath = null;
 
227
                                        }
 
228
                                }
 
229
                        }
 
230
 
 
231
                        //If pref is set
 
232
                        verifytapn = Preferences.getInstance().getVerifytapnLocation();
 
233
                        if (verifytapn != null && !verifytapn.isEmpty()) {
215
234
                                verifytapnpath = verifytapn;
216
235
                                VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
217
236
                                if(v.isCorrectVersion()){
221
240
                                        verifytapnpath = null;
222
241
                                }
223
242
                        }
224
 
                }
225
 
                
226
 
                //If pref is set
227
 
                verifytapn = Preferences.getInstance().getVerifytapnLocation();
228
 
                if (verifytapn != null && !verifytapn.isEmpty()) {
229
 
                        verifytapnpath = verifytapn;
230
 
                        return true;
231
 
                }
232
 
                
233
 
                //Search the installdir for verifytapn
234
 
                File installdir = TAPAAL.getInstallDir();
235
 
                
236
 
                String[] paths = {"/bin/verifytapn", "/bin/verifytapn64", "/bin/verifytapn.exe", "/bin/verifytapn64.exe"};
237
 
                for (String s : paths) {
238
 
                        File verifytapnfile = new File(installdir + s);
239
 
                        
240
 
                        if (verifytapnfile.exists()){
241
 
 
242
 
                                verifytapnpath = verifytapnfile.getAbsolutePath();
243
 
                                VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
244
 
                                if(v.isCorrectVersion()){
245
 
                                        return true;
246
 
                                }else{
247
 
                                        verifytapn = null;
248
 
                                        verifytapnpath = null;
 
243
 
 
244
                        //Search the installdir for verifytapn
 
245
                        File installdir = TAPAAL.getInstallDir();
 
246
 
 
247
                        String[] paths = {"/bin/verifytapn", "/bin/verifytapn64", "/bin/verifytapn.exe", "/bin/verifytapn64.exe"};
 
248
                        for (String s : paths) {
 
249
                                File verifytapnfile = new File(installdir + s);
 
250
 
 
251
                                if (verifytapnfile.exists()){
 
252
 
 
253
                                        verifytapnpath = verifytapnfile.getAbsolutePath();
 
254
                                        VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
 
255
                                        if(v.isCorrectVersion()){
 
256
                                                return true;
 
257
                                        }else{
 
258
                                                verifytapn = null;
 
259
                                                verifytapnpath = null;
 
260
                                        }
 
261
 
249
262
                                }
250
 
 
251
263
                        }
252
 
                }
253
 
                
254
 
                
255
 
                
256
 
                return false;
 
264
 
 
265
                        return false;
 
266
 
257
267
        }
258
268
 
259
269
        public VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions options, Tuple<TimedArcPetriNet, NameMapping> model, TAPNQuery query) throws Exception {