diff --git a/.classpath b/.classpath index 1ba2e07..fc43a69 100644 --- a/.classpath +++ b/.classpath @@ -13,7 +13,7 @@ - + @@ -31,6 +31,19 @@ + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 81c960e..a02e175 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ dependency-reduced-pom.xml -target/ +./target/ logs *.log -.vscode/ -.settings/ +./.vscode/ +./.settings/ .prettierrc \ No newline at end of file diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 654c175..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs deleted file mode 100644 index ec0c557..0000000 --- a/.settings/org.eclipse.jdt.apt.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 391de62..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 14b697b..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3be99a1..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "java.format.onType.enabled": false, - "java.format.settings.url": "D:\\dformat.xml", - "maven.view": "flat" -} \ No newline at end of file diff --git a/src/main/java/cn/dxp/PhysicalRealTimeRouteFinder.java b/src/main/java/cn/dxp/PhysicalRealTimeRouteFinder.java index 604e90a..4759b9a 100644 --- a/src/main/java/cn/dxp/PhysicalRealTimeRouteFinder.java +++ b/src/main/java/cn/dxp/PhysicalRealTimeRouteFinder.java @@ -8,7 +8,7 @@ import java.util.*; import org.json.JSONArray; import org.json.JSONObject; -public class PhysicalRealTimeRouteFinder{ +public class PhysicalRealTimeRouteFinder { public HttpSender httpSender; public MapGenerator mapGenerator; @@ -18,67 +18,67 @@ public class PhysicalRealTimeRouteFinder{ public int currentFrame = 0; public long startTime = System.currentTimeMillis(); - public PhysicalRealTimeRouteFinder(){ + public PhysicalRealTimeRouteFinder() { } - public void generateMap(double x, double y, double z){ + public void generateMap(double x, double y, double z) { this.mapGenerator = new MapGenerator(this, x, y, z); this.mapGenerator.start(); } - public boolean hasMap(){ - if(this.mapGenerator != null){ - if(this.mapGenerator.isSuccess()){ + public boolean hasMap() { + if (this.mapGenerator != null) { + if (this.mapGenerator.isSuccess()) { return true; } } return false; } - public HashMap getMap(){ - if(this.hasMap()){ + public HashMap getMap() { + if (this.hasMap()) { return this.mapGenerator.mapData; } return new HashMap(); } public void findRoute(HashMap map, Vector3 startPoint, Vector3 endPoint, - int threadCount){ + int threadCount) { this.routeFinder = new AdvancedRouteFinder(this, map, this.entity, threadCount); this.routeFinder.setStart(startPoint); this.routeFinder.setDestination(endPoint); this.routeFinder.taskSearch(); } - public void setEntity(Entity e){ + public void setEntity(Entity e) { this.entity = e; } - public boolean hasNewFrame(){ - if(this.frameQueue.size() > 0){ + public boolean hasNewFrame() { + if (this.frameQueue.size() > 0) { return true; } return false; } - public HashMap getNewFrame(){ + public HashMap getNewFrame() { return this.frameQueue.get(0); } - public boolean deleteNewFrame(){ + public boolean deleteNewFrame() { this.frameQueue.remove(0); return true; } - public void addNewFrame(HashMap f){ + public void addNewFrame(HashMap f) { this.frameQueue.add(f); } - public void resetHttpSender(){ - if(this.httpSender == null){ + public void resetHttpSender() { + if (this.httpSender == null) { this.httpSender = new HttpSender(this); - }else{ + } else { HttpSender old = this.httpSender; this.httpSender = new HttpSender(this); this.httpSender.dataQueue = old.dataQueue; @@ -86,13 +86,13 @@ public class PhysicalRealTimeRouteFinder{ this.httpSender.start(); } - public String encodeMapJsonData(){ + public String encodeMapJsonData() { JSONObject jsonData = new JSONObject(); HashMap mdata = this.mapGenerator.mapData; JSONArray map = new JSONArray(); int mapindex = 0; Iterator it = (Iterator) mdata.keySet().iterator(); - while(it.hasNext()){ + while (it.hasNext()) { Vector3 pos = (Vector3) it.next(); JSONArray point = new JSONArray(); point.put(0, pos.x); @@ -108,9 +108,9 @@ public class PhysicalRealTimeRouteFinder{ } @SuppressWarnings("unchecked") - public String encodeFrameJsonData(){ + public String encodeFrameJsonData() { HashMap fdata = this.getNewFrame(); - if(fdata == null){ + if (fdata == null) { return ""; } ArrayList rdata = (ArrayList) fdata.get("Route"); @@ -118,7 +118,7 @@ public class PhysicalRealTimeRouteFinder{ JSONObject en = new JSONObject(); JSONArray route = new JSONArray(); JSONObject info = new JSONObject(); - for(int i = 0; i < rdata.size(); i++){ + for (int i = 0; i < rdata.size(); i++) { Vector3 pos = rdata.get(i); JSONArray point = new JSONArray(); point.put(0, pos.x); @@ -128,7 +128,7 @@ public class PhysicalRealTimeRouteFinder{ } HashMap idata = (HashMap) fdata.get("Info"); Iterator it = (Iterator) idata.keySet().iterator(); - while(it.hasNext()){ + while (it.hasNext()) { String k = (String) it.next(); info.put(k, idata.get(k)); } @@ -143,7 +143,7 @@ public class PhysicalRealTimeRouteFinder{ jsonData.put("Route", route); jsonData.put("Info", info); jsonData.put("Entity", en); - System.out.println(this.currentFrame+"帧已打包，耗时"+String.valueOf(idata.get("FrameCalculateTime"))); + System.out.println(this.currentFrame + "帧已打包，耗时" + String.valueOf(idata.get("FrameCalculateTime"))); this.currentFrame++; this.deleteNewFrame(); return jsonData.toString(); diff --git a/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT-shaded.jar b/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT-shaded.jar deleted file mode 100644 index 1672bea..0000000 Binary files a/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT-shaded.jar and /dev/null differ diff --git a/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar b/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar deleted file mode 100644 index 1672bea..0000000 Binary files a/target/PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/target/classes/cn/dxp/PRTRF.class b/target/classes/cn/dxp/PRTRF.class deleted file mode 100644 index 009f156..0000000 Binary files a/target/classes/cn/dxp/PRTRF.class and /dev/null differ diff --git a/target/classes/cn/dxp/PhysicalRealTimeRouteFinder.class b/target/classes/cn/dxp/PhysicalRealTimeRouteFinder.class deleted file mode 100644 index 1faa431..0000000 Binary files a/target/classes/cn/dxp/PhysicalRealTimeRouteFinder.class and /dev/null differ diff --git a/target/classes/cn/dxp/map/MapGenerator.class b/target/classes/cn/dxp/map/MapGenerator.class deleted file mode 100644 index d4e87bf..0000000 Binary files a/target/classes/cn/dxp/map/MapGenerator.class and /dev/null differ diff --git a/target/classes/cn/dxp/math/Entity.class b/target/classes/cn/dxp/math/Entity.class deleted file mode 100644 index 6b4dc8d..0000000 Binary files a/target/classes/cn/dxp/math/Entity.class and /dev/null differ diff --git a/target/classes/cn/dxp/math/Vector3.class b/target/classes/cn/dxp/math/Vector3.class deleted file mode 100644 index 4dfe674..0000000 Binary files a/target/classes/cn/dxp/math/Vector3.class and /dev/null differ diff --git a/target/classes/cn/dxp/network/HttpSender$1.class b/target/classes/cn/dxp/network/HttpSender$1.class deleted file mode 100644 index 5c64e7d..0000000 Binary files a/target/classes/cn/dxp/network/HttpSender$1.class and /dev/null differ diff --git a/target/classes/cn/dxp/network/HttpSender.class b/target/classes/cn/dxp/network/HttpSender.class deleted file mode 100644 index a7b9a4b..0000000 Binary files a/target/classes/cn/dxp/network/HttpSender.class and /dev/null differ diff --git a/target/classes/cn/dxp/route/AdvancedRouteFinder.class b/target/classes/cn/dxp/route/AdvancedRouteFinder.class deleted file mode 100644 index cbd9b31..0000000 Binary files a/target/classes/cn/dxp/route/AdvancedRouteFinder.class and /dev/null differ diff --git a/target/classes/cn/dxp/route/Grid.class b/target/classes/cn/dxp/route/Grid.class deleted file mode 100644 index 96a8d71..0000000 Binary files a/target/classes/cn/dxp/route/Grid.class and /dev/null differ diff --git a/target/classes/cn/dxp/route/Node.class b/target/classes/cn/dxp/route/Node.class deleted file mode 100644 index c24da73..0000000 Binary files a/target/classes/cn/dxp/route/Node.class and /dev/null differ diff --git a/target/classes/cn/dxp/route/RouteFinder.class b/target/classes/cn/dxp/route/RouteFinder.class deleted file mode 100644 index 747a580..0000000 Binary files a/target/classes/cn/dxp/route/RouteFinder.class and /dev/null differ diff --git a/target/classes/cn/dxp/route/RouteTask.class b/target/classes/cn/dxp/route/RouteTask.class deleted file mode 100644 index fb4e616..0000000 Binary files a/target/classes/cn/dxp/route/RouteTask.class and /dev/null differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 711e1b5..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon May 10 14:25:53 CST 2021 -groupId=cn.dxp -artifactId=PhysicalRealTimeRouteFinder -version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 9b710f9..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\PRTRF.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\route\Grid.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\route\AdvancedRouteFinder.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\route\RouteTask.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\math\Vector3.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\network\HttpSender.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\route\Node.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\PhysicalRealTimeRouteFinder.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\route\RouteFinder.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\map\MapGenerator.java -e:\PhysicalRealTimeRouteFinder\src\main\java\cn\dxp\math\Entity.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 14f9111..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -cn\dxp\AppTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 8ac3569..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -E:\PhysicalRealTimeRouteFinder\src\test\java\cn\dxp\AppTest.java diff --git a/target/original-PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar b/target/original-PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar deleted file mode 100644 index b476550..0000000 Binary files a/target/original-PhysicalRealTimeRouteFinder-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/target/surefire-reports/TEST-cn.dxp.AppTest.xml b/target/surefire-reports/TEST-cn.dxp.AppTest.xml deleted file mode 100644 index 7d830f8..0000000 --- a/target/surefire-reports/TEST-cn.dxp.AppTest.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/surefire-reports/cn.dxp.AppTest.txt b/target/surefire-reports/cn.dxp.AppTest.txt deleted file mode 100644 index 2faf6f2..0000000 --- a/target/surefire-reports/cn.dxp.AppTest.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: cn.dxp.AppTest -------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec