1
=== modified file 'src/dk/aau/cs/io/queries/XMLQueryLoader.java'
2
--- src/dk/aau/cs/io/queries/XMLQueryLoader.java	2021-08-20 06:53:42 +0000
3
+++ src/dk/aau/cs/io/queries/XMLQueryLoader.java	2022-08-03 09:24:57 +0000
4
@@ -182,31 +182,31 @@
5
182
182
6
183
    public static boolean canBeLTL(Node prop) {
183
    public static boolean canBeLTL(Node prop) {
7
184
        NodeList children = prop.getChildNodes();
184
        NodeList children = prop.getChildNodes();
9
185
        int allPathsCounter = 0;
185
        int counter = 0;
10
186
186
11
187
        for (int i = 0; i < children.getLength(); i++) {
187
        for (int i = 0; i < children.getLength(); i++) {
12
188
            Node child = children.item(i);
188
            Node child = children.item(i);
13
189
            if (child.getNodeName().equals("formula")) {
189
            if (child.getNodeName().equals("formula")) {
15
190
                allPathsCounter += countAllPaths(child);
190
                counter += countSupportedPaths(child);
16
191
            }
191
            }
17
192
        }
192
        }
19
193
        return allPathsCounter == 1;
193
        return counter == 1;
20
194
    }
194
    }
21
195
195
23
196
    private static int countAllPaths(Node prop) {
196
    private static int countSupportedPaths(Node prop) {
24
197
        NodeList children = prop.getChildNodes();
197
        NodeList children = prop.getChildNodes();
26
198
        int allPathsCounter = 0;
198
        int counter = 0;
27
199
199
28
200
        for (int i = 0; i < children.getLength(); i++) {
200
        for (int i = 0; i < children.getLength(); i++) {
29
201
            Node child = children.item(i);
201
            Node child = children.item(i);
33
202
            if (child.getNodeName().equals("all-paths")) {
202
            if (child.getNodeName().equals("all-paths") || child.getNodeName().equals("exists-path")) {
34
203
                allPathsCounter++;
203
                counter++;
35
204
            } else if (child.getNodeName().equals("exists-path") || child.getNodeName().equals("deadlock")){
204
            } else if (child.getNodeName().equals("deadlock")){
36
205
                return 100;
205
                return 100;
37
206
            }
206
            }
39
207
            allPathsCounter += countAllPaths(child);
207
            counter += countSupportedPaths(child);
40
208
        }
208
        }
42
209
        return allPathsCounter;
209
        return counter;
43
210
    }
210
    }
44
211
211
45
212
    public static void importQueries(File file, TimedArcPetriNetNetwork network){
212
    public static void importQueries(File file, TimedArcPetriNetNetwork network){
Status:	Merged
Approved by:	Jiri Srba on 2022-08-03
Approved revision:	1173
Merged at revision:	1173
Proposed branch:	lp:~tapaal-contributor/tapaal/update-ltl-support
Merge into:	lp:tapaal
Diff against target:	45 lines (+10/-10) 1 file modified src/dk/aau/cs/io/queries/XMLQueryLoader.java (+10/-10)
To merge this branch:	bzr merge lp:~tapaal-contributor/tapaal/update-ltl-support
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jiri Srba		2022-08-03	Approve on 2022-08-03
Review via email: mp+427756@code.launchpad.net
1	=== modified file 'src/dk/aau/cs/io/queries/XMLQueryLoader.java'
2	--- src/dk/aau/cs/io/queries/XMLQueryLoader.java 2021-08-20 06:53:42 +0000
3	+++ src/dk/aau/cs/io/queries/XMLQueryLoader.java 2022-08-03 09:24:57 +0000
4	@@ -182,31 +182,31 @@
5	182		182
6	183	public static boolean canBeLTL(Node prop) {	183	public static boolean canBeLTL(Node prop) {
7	184	NodeList children = prop.getChildNodes();	184	NodeList children = prop.getChildNodes();
9	185	int allPathsCounter = 0;	185	int counter = 0;
10	186		186
11	187	for (int i = 0; i < children.getLength(); i++) {	187	for (int i = 0; i < children.getLength(); i++) {
12	188	Node child = children.item(i);	188	Node child = children.item(i);
13	189	if (child.getNodeName().equals("formula")) {	189	if (child.getNodeName().equals("formula")) {
15	190	allPathsCounter += countAllPaths(child);	190	counter += countSupportedPaths(child);
16	191	}	191	}
17	192	}	192	}
19	193	return allPathsCounter == 1;	193	return counter == 1;
20	194	}	194	}
21	195		195
23	196	private static int countAllPaths(Node prop) {	196	private static int countSupportedPaths(Node prop) {
24	197	NodeList children = prop.getChildNodes();	197	NodeList children = prop.getChildNodes();
26	198	int allPathsCounter = 0;	198	int counter = 0;
27	199		199
28	200	for (int i = 0; i < children.getLength(); i++) {	200	for (int i = 0; i < children.getLength(); i++) {
29	201	Node child = children.item(i);	201	Node child = children.item(i);
33	202	if (child.getNodeName().equals("all-paths")) {	202	if (child.getNodeName().equals("all-paths") \|\| child.getNodeName().equals("exists-path")) {
34	203	allPathsCounter++;	203	counter++;
35	204	} else if (child.getNodeName().equals("exists-path") \|\| child.getNodeName().equals("deadlock")){	204	} else if (child.getNodeName().equals("deadlock")){
36	205	return 100;	205	return 100;
37	206	}	206	}
39	207	allPathsCounter += countAllPaths(child);	207	counter += countSupportedPaths(child);
40	208	}	208	}
42	209	return allPathsCounter;	209	return counter;
43	210	}	210	}
44	211		211
45	212	public static void importQueries(File file, TimedArcPetriNetNetwork network){	212	public static void importQueries(File file, TimedArcPetriNetNetwork network){