Skip to content

Commit 46b9000

Browse files
author
“jklein94”
committed
Added descriptions for aba website + refactoring
1 parent 49a2b72 commit 46b9000

31 files changed

Lines changed: 155 additions & 174 deletions

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/Callee.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/Callee.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22

33
import java.util.concurrent.Callable;
44

@@ -10,5 +10,5 @@ public Object call() throws Exception {
1010
throw new UnsupportedOperationException("Unimplemented method 'call'");
1111
}
1212

13-
13+
1414
}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/Ping.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/Ping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22
import java.util.Objects;
33

44
public class Ping {

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/Post.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/Post.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22
import java.util.Objects;
33

44
public class Post {
55
private String cmd;
6-
6+
77

88
public Post() {
99
}
@@ -42,5 +42,5 @@ public String toString() {
4242
" cmd='" + getCmd() + "'" +
4343
"}";
4444
}
45-
45+
4646
}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/RequestController.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/RequestController.java

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22

33
import java.io.FileNotFoundException;
44
import java.io.IOException;
@@ -45,17 +45,27 @@
4545
import org.tweetyproject.math.opt.solver.GlpkSolver;
4646
import org.tweetyproject.math.opt.solver.Solver;
4747
import org.tweetyproject.web.TweetyServer;
48-
import org.tweetyproject.web.pyargservices.dung.AbstractExtensionReasonerFactory;
49-
import org.tweetyproject.web.pyargservices.dung.DungReasonerCalleeFactory;
50-
import org.tweetyproject.web.pyargservices.dung.DungReasonerResponse;
51-
import org.tweetyproject.web.pyargservices.dung.DungServicesInfoResponse;
52-
import org.tweetyproject.web.pyargservices.dung.AbstractExtensionReasonerFactory.Semantics;
53-
import org.tweetyproject.web.pyargservices.dung.DungReasonerCalleeFactory.Command;
54-
import org.tweetyproject.web.pyargservices.incmes.InconsistencyGetMeasuresResponse;
55-
import org.tweetyproject.web.pyargservices.incmes.InconsistencyPost;
56-
import org.tweetyproject.web.pyargservices.incmes.InconsistencyValueResponse;
5748
import org.tweetyproject.web.services.DelpService;
5849
import org.tweetyproject.web.services.InconsistencyMeasurementService;
50+
import org.tweetyproject.web.spring_services.aba.AbaGetSemanticsResponse;
51+
import org.tweetyproject.web.spring_services.aba.AbaReasonerCalleeFactory;
52+
import org.tweetyproject.web.spring_services.aba.AbaReasonerGetModelsCallee;
53+
import org.tweetyproject.web.spring_services.aba.AbaReasonerPost;
54+
import org.tweetyproject.web.spring_services.aba.AbaReasonerResponse;
55+
import org.tweetyproject.web.spring_services.aba.GeneralAbaReasonerFactory;
56+
import org.tweetyproject.web.spring_services.delp.DelpCallee;
57+
import org.tweetyproject.web.spring_services.delp.DelpPost;
58+
import org.tweetyproject.web.spring_services.delp.DelpResponse;
59+
import org.tweetyproject.web.spring_services.dung.AbstractExtensionReasonerFactory;
60+
import org.tweetyproject.web.spring_services.dung.DungReasonerCalleeFactory;
61+
import org.tweetyproject.web.spring_services.dung.DungReasonerPost;
62+
import org.tweetyproject.web.spring_services.dung.DungReasonerResponse;
63+
import org.tweetyproject.web.spring_services.dung.DungServicesInfoResponse;
64+
import org.tweetyproject.web.spring_services.dung.AbstractExtensionReasonerFactory.Semantics;
65+
import org.tweetyproject.web.spring_services.dung.DungReasonerCalleeFactory.Command;
66+
import org.tweetyproject.web.spring_services.incmes.InconsistencyGetMeasuresResponse;
67+
import org.tweetyproject.web.spring_services.incmes.InconsistencyPost;
68+
import org.tweetyproject.web.spring_services.incmes.InconsistencyValueResponse;
5969
import org.springframework.web.bind.annotation.ResponseBody;
6070
import org.springframework.web.bind.annotation.RequestBody;
6171
import org.tweetyproject.arg.aba.examples.AbaExample;
@@ -73,16 +83,7 @@
7383
import org.tweetyproject.arg.delp.syntax.DefeasibleLogicProgram;
7484
import org.tweetyproject.arg.dung.reasoner.AbstractExtensionReasoner;
7585
import org.tweetyproject.arg.dung.semantics.Extension;
76-
import org.tweetyproject.web.pyargservices.aba.AbaGetSemanticsResponse;
77-
import org.tweetyproject.web.pyargservices.aba.AbaReasonerCalleeFactory;
78-
import org.tweetyproject.web.pyargservices.aba.AbaReasonerGetModelsCallee;
79-
import org.tweetyproject.web.pyargservices.aba.AbaReasonerPost;
80-
import org.tweetyproject.web.pyargservices.aba.AbaReasonerResponse;
81-
import org.tweetyproject.web.pyargservices.aba.GeneralAbaReasonerFactory;
82-
import org.tweetyproject.web.pyargservices.delp.DelpCallee;
83-
import org.tweetyproject.web.pyargservices.delp.DelpPost;
84-
import org.tweetyproject.web.pyargservices.delp.DelpResponse;
85-
import org.tweetyproject.web.pyargservices.dung.DungReasonerPost;
86+
8687
import javafx.util.Pair;
8788

8889
@RestController
@@ -111,7 +112,7 @@ public Response handleRequest(
111112
SatSolver.setDefaultSolver(new Sat4jSolver());
112113
if (AbaReasonerPost.getKb_format().equals("pl")) {
113114
AbaParser<PlFormula> parser1 = new AbaParser<PlFormula>(new PlParser());
114-
Assumption<PlFormula> a = new Assumption<>(new Proposition("a"));
115+
Assumption<PlFormula> a = new Assumption<>(new Proposition(AbaReasonerPost.getQuery_assumption()));
115116
AbaTheory<PlFormula> abat1 = null;
116117
try {
117118
abat1 = parser1.parseBeliefBase(AbaReasonerPost.getKb());
@@ -275,10 +276,10 @@ public Ping ping(@RequestBody Ping ping_Greeting) {
275276

276277
@PostMapping(value = "/info", produces = "application/json")
277278
@ResponseBody
278-
public DungServicesInfoResponse getInfo(@RequestBody DungReasonerPost pyArgPost) {
279+
public DungServicesInfoResponse getInfo(@RequestBody DungReasonerPost dungPost) {
279280
DungServicesInfoResponse response = new DungServicesInfoResponse();
280281
response.setReply("info");
281-
response.setEmail(pyArgPost.getEmail());
282+
response.setEmail(dungPost.getEmail());
282283
response.setBackend_timeout(SERVICES_TIMEOUT_DUNG);
283284
Semantics[] sem = AbstractExtensionReasonerFactory.getSemantics();
284285
ArrayList<String> semantics_ids = new ArrayList<String>();
@@ -513,7 +514,7 @@ private AbaGetSemanticsResponse handleGetSemantics(AbaReasonerPost query)
513514
AbaGetSemanticsResponse response = new AbaGetSemanticsResponse();
514515
List<HashMap<String, String>> value = new LinkedList<HashMap<String, String>>();
515516
HashMap<String, String> jsonMes;
516-
for (org.tweetyproject.web.pyargservices.aba.GeneralAbaReasonerFactory.Semantics m : GeneralAbaReasonerFactory.Semantics.values()) {
517+
for (org.tweetyproject.web.spring_services.aba.GeneralAbaReasonerFactory.Semantics m : GeneralAbaReasonerFactory.Semantics.values()) {
517518
jsonMes = new HashMap<String, String>();
518519
jsonMes.put(InconsistencyMeasurementService.JSON_ATTR_ID, m.id);
519520
jsonMes.put(InconsistencyMeasurementService.JSON_ATTR_LABEL, m.label);

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/Response.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/Response.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22

33
import org.codehaus.jettison.json.JSONObject;
44

55
public class Response {
6-
6+
77
}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/RestServiceCorsApplication.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/RestServiceCorsApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22
import java.util.ArrayList;
33
import java.util.Arrays;
44

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/Utils.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/Utils.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tweetyproject.web.pyargservices;
1+
package org.tweetyproject.web.spring_services;
22

33
import java.util.ArrayList;
44
import java.util.Collection;
@@ -28,13 +28,13 @@ public static DungTheory getDungTheory(int nr_of_arguments, List<List<Integer>>
2828
for (Argument arg: arguments){
2929
af_graph.add(arg);
3030
}
31-
for (List<Integer> list : atttacks) {
31+
for (List<Integer> list : atttacks) {
3232
af_graph.add(new DirectedEdge<Argument>(arguments.get(list.get(0) - 1),arguments.get(list.get(1) - 1)));
3333
}
34-
34+
3535
DungTheory dungTheory = new DungTheory(af_graph);
3636
return dungTheory;
37-
}
37+
}
3838

3939
public static String returnLowerCase(String stringInput) {
4040
return stringInput.toLowerCase();
@@ -49,7 +49,7 @@ public static TimeUnit getTimoutUnit(String unit){
4949
case "ms":
5050
System.out.println("Unit of timeout set to ms" );
5151
return TimeUnit.MILLISECONDS;
52-
52+
5353
case "sec":
5454
System.out.println("Unit of timeout set to seconds" );
5555
return TimeUnit.SECONDS;
@@ -73,7 +73,7 @@ public static <T> Pair<T,Long> runServicesWithTimeout(Future<T> future, long tim
7373

7474
return new Pair<T,Long>(result, time);
7575
}
76-
76+
7777
public static int checkUserTimeout(int user_timeout, int server_timeout, TimeUnit unit){
7878
if(unit.equals(TimeUnit.MILLISECONDS))
7979
server_timeout = server_timeout * 1000;
@@ -84,6 +84,6 @@ public static int checkUserTimeout(int user_timeout, int server_timeout, TimeUni
8484
return user_timeout;
8585
}
8686

87-
87+
8888

8989
}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/aba/AbaGetSemanticsResponse.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/aba/AbaGetSemanticsResponse.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package org.tweetyproject.web.pyargservices.aba;
1+
package org.tweetyproject.web.spring_services.aba;
22

33
import java.util.HashMap;
44
import java.util.List;
5-
6-
import org.tweetyproject.web.pyargservices.Response;
7-
85
import java.util.Objects;
96

7+
import org.tweetyproject.web.spring_services.Response;
8+
109
public class AbaGetSemanticsResponse extends Response {
1110
private List<HashMap<String, String>> semantics;
1211
private String reply;

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/aba/AbaReasonerCalleeFactory.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/aba/AbaReasonerCalleeFactory.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.tweetyproject.web.pyargservices.aba;
1+
package org.tweetyproject.web.spring_services.aba;
22

33
import org.tweetyproject.arg.aba.reasoner.GeneralAbaReasoner;
44
import org.tweetyproject.arg.aba.syntax.AbaTheory;
55
import org.tweetyproject.arg.aba.syntax.Assumption;
66
import org.tweetyproject.commons.Formula;
77
import org.tweetyproject.logics.fol.syntax.FolFormula;
88
import org.tweetyproject.logics.pl.syntax.PlFormula;
9-
import org.tweetyproject.web.pyargservices.Callee;
9+
import org.tweetyproject.web.spring_services.Callee;
1010

1111

1212

@@ -63,14 +63,4 @@ public static <T extends Formula> Callee getCallee(Command cmd, GeneralAbaReason
6363
throw new RuntimeException("Command not found: " + cmd.toString());
6464
}
6565
}
66-
// public static Callee getCallee(org.tweetyproject.web.pyargservices.dung.DungReasonerCalleeFactory.Command command,
67-
// GeneralAbaReasoner<PlFormula> r1, AbaTheory<PlFormula> abat1) {
68-
// switch(command){
69-
// case GET_MODELS:
70-
// return new AbaReasonerGetModelsCallee<PlFormula>(r1, abat1);
71-
// default:
72-
// throw new RuntimeException("Command not found: " + command.toString());
73-
// }
74-
// }
75-
7666
}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/aba/AbaReasonerGetModelCallee.java renamed to org-tweetyproject-web/src/main/java/org/tweetyproject/web/spring_services/aba/AbaReasonerGetModelCallee.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.tweetyproject.web.pyargservices.aba;
1+
package org.tweetyproject.web.spring_services.aba;
22

33

44

55
import org.tweetyproject.arg.aba.reasoner.GeneralAbaReasoner;
66
import org.tweetyproject.arg.aba.semantics.AbaExtension;
77
import org.tweetyproject.arg.aba.syntax.AbaTheory;
88
import org.tweetyproject.commons.Formula;
9-
import org.tweetyproject.web.pyargservices.Callee;
9+
import org.tweetyproject.web.spring_services.Callee;
1010

1111
public class AbaReasonerGetModelCallee<T extends Formula> extends Callee {
1212
GeneralAbaReasoner<T> reasoner;

0 commit comments

Comments
 (0)