← Back to branch summary

~tapaal-contributor/tapaal/disappearing-tokens-1940098

« back to all changes in this revision

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

  • Committer: Jiri Srba
  • Date: 2021-02-28 13:58:39 UTC
  • mfrom: (1112.2.6 add-tar-option)
  • Revision ID: srba@cs.aau.dk-20210228135839-yxy8ljbc89ou0woi
merged in lp:~tapaal-contributor/tapaal/add-tar-option adding the -tar option for the verifypn engine

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/verification/VerifyTAPN/VerifyPNOptions.java
19
19
        private boolean useSiphontrap = false; 
20
20
        private QueryReductionTime queryReductionTime;
21
21
        private boolean useStubbornReduction = true;
 
22
        private boolean useTarOption;
22
23
        private String pathToReducedNet;
23
24
        
24
25
        public VerifyPNOptions(int extraTokens, TraceOption traceOption, SearchOption search, boolean useOverApproximation, ModelReduction modelReduction,
25
26
                           boolean enableOverApproximation, boolean enableUnderApproximation, int approximationDenominator, QueryCategory queryCategory, AlgorithmOption algorithmOption,
26
 
                           boolean siphontrap, QueryReductionTime queryReduction, boolean stubbornReduction, String pathToReducedNet) {
27
 
                super(extraTokens, traceOption, search, true, useOverApproximation, false, new InclusionPlaces(), enableOverApproximation, enableUnderApproximation, approximationDenominator);
 
27
                           boolean siphontrap, QueryReductionTime queryReduction, boolean stubbornReduction, String pathToReducedNet, boolean useTarOption) {
 
28
                super(extraTokens, traceOption, search, true, useOverApproximation, false, new InclusionPlaces(), enableOverApproximation, enableUnderApproximation, approximationDenominator, useTarOption);
28
29
                this.modelReduction = modelReduction;
29
30
                this.queryCategory = queryCategory;
30
31
                this.algorithmOption = algorithmOption;
31
32
                this.useSiphontrap = siphontrap;
32
33
                this.queryReductionTime = queryReduction;
33
34
                this.useStubbornReduction = stubbornReduction;
 
35
                this.useTarOption = useTarOption;
34
36
                this.pathToReducedNet = pathToReducedNet;
35
37
        }
36
 
        
 
38
 
37
39
        public VerifyPNOptions(int extraTokens, TraceOption traceOption, SearchOption search, boolean useOverApproximation, boolean useModelReduction,
38
40
                           boolean enableOverApproximation, boolean enableUnderApproximation, int approximationDenominator, QueryCategory queryCategory, AlgorithmOption algorithmOption,
39
41
                           boolean siphontrap, QueryReductionTime queryReduction, boolean stubbornReduction) {
40
42
                this(extraTokens, traceOption, search, useOverApproximation, useModelReduction? ModelReduction.AGGRESSIVE:ModelReduction.NO_REDUCTION, enableOverApproximation, 
41
 
                        enableUnderApproximation, approximationDenominator,queryCategory, algorithmOption, siphontrap, queryReduction, stubbornReduction, null);
 
43
                        enableUnderApproximation, approximationDenominator,queryCategory, algorithmOption, siphontrap, queryReduction, stubbornReduction, null, false);
42
44
        }
43
45
 
44
46
        @Override
83
85
                if (!this.useStubbornReduction) {
84
86
                        result.append(" -p ");
85
87
                }
 
88
                if (this.useTarOption) {
 
89
                    result.append(" -tar ");
 
90
        }
86
91
                return result.toString();
87
92
        }
88
93