From 4dbae5c6f3145819df3ac13f85fb245e4ca7001f Mon Sep 17 00:00:00 2001 From: Giacomo Bertolazzi <31776951+Berack96@users.noreply.github.com> Date: Wed, 28 Sep 2022 22:02:25 +0200 Subject: [PATCH 1/2] Create LICENSE.md --- LICENSE.md | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- 2.49.1 From aba1f55bc0b64c731865c5a910e554b97ebb9a31 Mon Sep 17 00:00:00 2001 From: Berack96 Date: Wed, 12 Mar 2025 09:25:57 +0100 Subject: [PATCH 2/2] Path refactoring net.berack is now the corect pakage, update java to 23 --- .vscode/settings.json | 3 ++ pom.xml | 4 +-- .../berack96/lib/graph/ObjectsComparator.java | 18 ----------- .../lib/graph => net/berack/upo}/Graph.java | 30 ++++++++++++------- .../berack/upo}/GraphDirected.java | 11 +++---- .../berack/upo}/GraphUndirected.java | 9 +++--- .../lib => net/berack/upo}/graph/Edge.java | 2 +- .../berack/upo/graph}/ListGraph.java | 14 ++++----- .../berack/upo/graph}/MapGraph.java | 16 +++++----- .../berack/upo/graph}/MatrixGraph.java | 12 ++++---- .../berack/upo/graph}/MatrixUndGraph.java | 11 ++++--- .../lib => net/berack/upo}/graph/Vertex.java | 8 ++--- .../upo/graph}/VisitDistSourceDest.java | 7 ++--- .../berack/upo/graph}/VisitDistance.java | 4 +-- .../berack/upo/graph}/VisitMST.java | 4 +-- .../berack/upo/graph}/VisitSCC.java | 2 +- .../berack/upo/graph}/VisitStrategy.java | 10 +++---- .../berack/upo/graph}/VisitTopological.java | 2 +- .../graph/savemodels}/EdgeSaveStructure.java | 2 +- .../graph/savemodels}/GraphSaveStructure.java | 9 +++--- .../graph/savemodels}/MarkSaveStructure.java | 2 +- .../berack/upo}/graph/view/GraphInfo.java | 23 +++++++------- .../berack/upo}/graph/view/GraphListener.java | 2 +- .../berack/upo}/graph/view/GraphPanel.java | 14 ++++----- .../upo}/graph/view/GraphPointsSave.java | 8 ++--- .../berack/upo}/graph/view/GraphWindow.java | 19 ++++++------ .../berack/upo}/graph/view/GraphicalView.java | 2 +- .../berack/upo}/graph/view/Main.java | 12 ++++---- .../berack/upo}/graph/view/VisitListener.java | 15 +++++----- .../upo}/graph/view/edge/EdgeComponent.java | 8 ++--- .../upo}/graph/view/edge/EdgeIntListener.java | 6 ++-- .../upo}/graph/view/edge/EdgeListener.java | 12 ++++---- .../berack/upo}/graph/view/edge/EdgeView.java | 8 ++--- .../upo/graph/view/polygons}/Arrow.java | 2 +- .../graph/view/vertex/VertexComponent.java | 6 ++-- .../graph/view/vertex/VertexIntListener.java | 8 ++--- .../graph/view/vertex/VertexListener.java | 10 +++---- .../upo}/graph/view/vertex/VertexView.java | 6 ++-- .../berack/upo/graph/visit}/BFS.java | 8 ++--- .../berack/upo/graph/visit}/DFS.java | 8 ++--- .../berack/upo/graph/visit}/Dijkstra.java | 10 +++---- .../berack/upo/graph/visit}/Kruskal.java | 16 +++++----- .../berack/upo/graph/visit}/Prim.java | 12 ++++---- .../berack/upo/graph/visit}/Tarjan.java | 10 +++---- .../berack/upo/graph/visit}/VisitInfo.java | 14 ++++----- .../upo/graph/visit}/struct/QuickFind.java | 4 +-- .../upo/graph/visit}/struct/UnionFind.java | 2 +- .../berack/upo/graph/test}/TestGraph.java | 30 +++++++++++-------- 48 files changed, 227 insertions(+), 228 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 src/main/java/berack96/lib/graph/ObjectsComparator.java rename src/main/java/{berack96/lib/graph => net/berack/upo}/Graph.java (97%) rename src/main/java/{berack96/lib/graph => net/berack/upo}/GraphDirected.java (97%) rename src/main/java/{berack96/lib/graph => net/berack/upo}/GraphUndirected.java (90%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/Edge.java (98%) rename src/main/java/{berack96/lib/graph/impl => net/berack/upo/graph}/ListGraph.java (92%) rename src/main/java/{berack96/lib/graph/impl => net/berack/upo/graph}/MapGraph.java (89%) rename src/main/java/{berack96/lib/graph/impl => net/berack/upo/graph}/MatrixGraph.java (95%) rename src/main/java/{berack96/lib/graph/impl => net/berack/upo/graph}/MatrixUndGraph.java (95%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/Vertex.java (98%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitDistSourceDest.java (90%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitDistance.java (94%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitMST.java (84%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitSCC.java (92%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitStrategy.java (91%) rename src/main/java/{berack96/lib/graph/visit => net/berack/upo/graph}/VisitTopological.java (94%) rename src/main/java/{berack96/lib/graph/models => net/berack/upo/graph/savemodels}/EdgeSaveStructure.java (88%) rename src/main/java/{berack96/lib/graph/models => net/berack/upo/graph/savemodels}/GraphSaveStructure.java (95%) rename src/main/java/{berack96/lib/graph/models => net/berack/upo/graph/savemodels}/MarkSaveStructure.java (86%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphInfo.java (94%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphListener.java (95%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphPanel.java (96%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphPointsSave.java (92%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphWindow.java (77%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/GraphicalView.java (95%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/Main.java (72%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/VisitListener.java (91%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/edge/EdgeComponent.java (82%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/edge/EdgeIntListener.java (79%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/edge/EdgeListener.java (94%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/edge/EdgeView.java (97%) rename src/main/java/{berack96/lib/graph/view/stuff => net/berack/upo/graph/view/polygons}/Arrow.java (98%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/vertex/VertexComponent.java (89%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/vertex/VertexIntListener.java (84%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/vertex/VertexListener.java (93%) rename src/main/java/{berack96/lib => net/berack/upo}/graph/view/vertex/VertexView.java (95%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/BFS.java (92%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/DFS.java (92%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/Dijkstra.java (95%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/Kruskal.java (78%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/Prim.java (89%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/Tarjan.java (95%) rename src/main/java/{berack96/lib/graph/visit/impl => net/berack/upo/graph/visit}/VisitInfo.java (97%) rename src/main/java/{berack96/lib/graph => net/berack/upo/graph/visit}/struct/QuickFind.java (96%) rename src/main/java/{berack96/lib/graph => net/berack/upo/graph/visit}/struct/UnionFind.java (97%) rename src/test/java/{berack96/test/lib => net/berack/upo/graph/test}/TestGraph.java (99%) diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5cfc0ad..e47fbc3 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,8 @@ - 17 - 17 + 23 + 23 \ No newline at end of file diff --git a/src/main/java/berack96/lib/graph/ObjectsComparator.java b/src/main/java/berack96/lib/graph/ObjectsComparator.java deleted file mode 100644 index e3668dd..0000000 --- a/src/main/java/berack96/lib/graph/ObjectsComparator.java +++ /dev/null @@ -1,18 +0,0 @@ -package berack96.lib.graph; -import java.util.Comparator; - -/** - * Compare two arbitrary objects.
- * It uses the method hashCode that every object has to compare two objects.
- * This is a simple use - */ -public class ObjectsComparator implements Comparator { - static public final ObjectsComparator instance = new ObjectsComparator(); - - private ObjectsComparator(){}; - - @Override - public int compare(Object o1, Object o2) { - return o1.hashCode() - o2.hashCode(); - } -} diff --git a/src/main/java/berack96/lib/graph/Graph.java b/src/main/java/net/berack/upo/Graph.java similarity index 97% rename from src/main/java/berack96/lib/graph/Graph.java rename to src/main/java/net/berack/upo/Graph.java index a6c93e5..b0d9458 100644 --- a/src/main/java/berack96/lib/graph/Graph.java +++ b/src/main/java/net/berack/upo/Graph.java @@ -1,13 +1,15 @@ -package berack96.lib.graph; - -import berack96.lib.graph.visit.VisitStrategy; -import berack96.lib.graph.visit.impl.BFS; -import berack96.lib.graph.visit.impl.Dijkstra; -import berack96.lib.graph.visit.impl.VisitInfo; +package net.berack.upo; import java.util.*; import java.util.function.Consumer; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.Vertex; +import net.berack.upo.graph.VisitStrategy; +import net.berack.upo.graph.visit.BFS; +import net.berack.upo.graph.visit.Dijkstra; +import net.berack.upo.graph.visit.VisitInfo; + /** * An abstract class for the graphs.
* This class is used for the graphs in general.
@@ -24,6 +26,12 @@ public abstract class Graph implements Iterable { public final static String NOT_CONNECTED = "The source vertex doesn't have a path that reach the destination"; public final static String PARAM_NULL = "The parameter must not be null"; public final static String VERTEX_NOT_CONTAINED = "The vertex must be contained in the graph"; + public final static Comparator OBJECT_COMPARATOR = new Comparator() { + @Override + public int compare(Object o1, Object o2) { + return o1.hashCode() - o2.hashCode(); + } + }; /** * Create the default map. All operations are O(log(n))
@@ -34,7 +42,7 @@ public abstract class Graph implements Iterable { * @return A newly created TreeMap instance with ObjectsComparator as comparator */ public final static Map getDefaultMap() { - return new TreeMap(ObjectsComparator.instance); + return new TreeMap(OBJECT_COMPARATOR); } /** @@ -46,7 +54,7 @@ public abstract class Graph implements Iterable { * @return A newly created TreeSet instance with ObjectsComparator as comparator */ public final static Set getDefaultSet() { - return new TreeSet(ObjectsComparator.instance); + return new TreeSet(OBJECT_COMPARATOR); } //------------------- INSTANCE ----------------- @@ -359,7 +367,7 @@ public abstract class Graph implements Iterable { */ public final Set marks() { Set ret = getDefaultSet(); - markers.forEach((v, set) -> ret.addAll(set)); + markers.forEach((_, set) -> ret.addAll(set)); return ret; } @@ -376,7 +384,7 @@ public abstract class Graph implements Iterable { public final void mark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException { check(mark); checkVert(vertex); - Set marks = markers.computeIfAbsent(vertex, v -> getDefaultSet()); + Set marks = markers.computeIfAbsent(vertex, _ -> getDefaultSet()); marks.add(mark); } @@ -391,7 +399,7 @@ public abstract class Graph implements Iterable { public final void unMark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException { check(mark); checkVert(vertex); - markers.computeIfPresent(vertex, (v, set) -> { + markers.computeIfPresent(vertex, (_, set) -> { set.remove(mark); if (set.size() > 0) return set; diff --git a/src/main/java/berack96/lib/graph/GraphDirected.java b/src/main/java/net/berack/upo/GraphDirected.java similarity index 97% rename from src/main/java/berack96/lib/graph/GraphDirected.java rename to src/main/java/net/berack/upo/GraphDirected.java index 9bbce28..b136452 100644 --- a/src/main/java/berack96/lib/graph/GraphDirected.java +++ b/src/main/java/net/berack/upo/GraphDirected.java @@ -1,12 +1,13 @@ -package berack96.lib.graph; - -import berack96.lib.graph.visit.VisitSCC; -import berack96.lib.graph.visit.VisitTopological; -import berack96.lib.graph.visit.impl.Tarjan; +package net.berack.upo; import java.util.List; import java.util.Set; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.VisitSCC; +import net.berack.upo.graph.VisitTopological; +import net.berack.upo.graph.visit.Tarjan; + /** * This is a more specific interface for an implementation of a Undirected Graph.
* An Undirected Graph is a Graph where an arc or edge can be traversed in both ways.
diff --git a/src/main/java/berack96/lib/graph/GraphUndirected.java b/src/main/java/net/berack/upo/GraphUndirected.java similarity index 90% rename from src/main/java/berack96/lib/graph/GraphUndirected.java rename to src/main/java/net/berack/upo/GraphUndirected.java index 96bcb37..992dc32 100644 --- a/src/main/java/berack96/lib/graph/GraphUndirected.java +++ b/src/main/java/net/berack/upo/GraphUndirected.java @@ -1,10 +1,11 @@ -package berack96.lib.graph; - -import berack96.lib.graph.visit.VisitMST; -import berack96.lib.graph.visit.impl.Prim; +package net.berack.upo; import java.util.Set; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.VisitMST; +import net.berack.upo.graph.visit.Prim; + /** * This is a more specific interface for an implementation of a Directed Graph.
* A Directed Graph is a Graph where an arc or edge can be traversed in only one way.
diff --git a/src/main/java/berack96/lib/graph/Edge.java b/src/main/java/net/berack/upo/graph/Edge.java similarity index 98% rename from src/main/java/berack96/lib/graph/Edge.java rename to src/main/java/net/berack/upo/graph/Edge.java index 239bddd..4d7bdc0 100644 --- a/src/main/java/berack96/lib/graph/Edge.java +++ b/src/main/java/net/berack/upo/graph/Edge.java @@ -1,4 +1,4 @@ -package berack96.lib.graph; +package net.berack.upo.graph; import java.util.Collection; import java.util.List; diff --git a/src/main/java/berack96/lib/graph/impl/ListGraph.java b/src/main/java/net/berack/upo/graph/ListGraph.java similarity index 92% rename from src/main/java/berack96/lib/graph/impl/ListGraph.java rename to src/main/java/net/berack/upo/graph/ListGraph.java index 88acea1..b40c269 100644 --- a/src/main/java/berack96/lib/graph/impl/ListGraph.java +++ b/src/main/java/net/berack/upo/graph/ListGraph.java @@ -1,11 +1,11 @@ -package berack96.lib.graph.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphDirected; +package net.berack.upo.graph; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import net.berack.upo.Graph; +import net.berack.upo.GraphDirected; + /** * An implementation of the graph using an adjacent list for representing the edges * @@ -46,7 +46,7 @@ public class ListGraph extends GraphDirected { public void remove(V vertex) { checkVert(vertex); adj.remove(vertex); - adj.forEach((v, list) -> list.remove(getAdj(list, vertex))); + adj.forEach((_, list) -> list.remove(getAdj(list, vertex))); } @Override @@ -129,12 +129,12 @@ public class ListGraph extends GraphDirected { public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException { checkVert(vertex); adj.get(vertex).clear(); - adj.forEach((v, list) -> list.remove(getAdj(list, vertex))); + adj.forEach((_, list) -> list.remove(getAdj(list, vertex))); } @Override public void removeAllEdge() { - adj.forEach((v, list) -> list.clear()); + adj.forEach((_, list) -> list.clear()); } @Override diff --git a/src/main/java/berack96/lib/graph/impl/MapGraph.java b/src/main/java/net/berack/upo/graph/MapGraph.java similarity index 89% rename from src/main/java/berack96/lib/graph/impl/MapGraph.java rename to src/main/java/net/berack/upo/graph/MapGraph.java index 600de5c..a1ec891 100644 --- a/src/main/java/berack96/lib/graph/impl/MapGraph.java +++ b/src/main/java/net/berack/upo/graph/MapGraph.java @@ -1,11 +1,11 @@ -package berack96.lib.graph.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphDirected; +package net.berack.upo.graph; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import net.berack.upo.Graph; +import net.berack.upo.GraphDirected; + /** * Graph that uses TreeMap for vertices and edges
* More specifically it utilizes a Map containing all the vertices mapped to all their edges
@@ -40,8 +40,8 @@ public class MapGraph extends GraphDirected { @Override public void add(V vertex) { check(vertex); - edges.computeIfAbsent(vertex, v -> new TreeMap<>()); - edges.forEach((v, adj) -> adj.remove(vertex)); + edges.computeIfAbsent(vertex, _ -> new TreeMap<>()); + edges.forEach((_, adj) -> adj.remove(vertex)); edges.get(vertex).clear(); } @@ -55,7 +55,7 @@ public class MapGraph extends GraphDirected { public void remove(V vertex) { checkVert(vertex); edges.remove(vertex); - edges.forEach((v, map) -> map.remove(vertex)); + edges.forEach((_, map) -> map.remove(vertex)); } @Override @@ -109,7 +109,7 @@ public class MapGraph extends GraphDirected { @Override public int numberOfEdges() { AtomicInteger sum = new AtomicInteger(0); - edges.forEach((v, map) -> sum.getAndAdd(map.size())); + edges.forEach((_, map) -> sum.getAndAdd(map.size())); return sum.get(); } diff --git a/src/main/java/berack96/lib/graph/impl/MatrixGraph.java b/src/main/java/net/berack/upo/graph/MatrixGraph.java similarity index 95% rename from src/main/java/berack96/lib/graph/impl/MatrixGraph.java rename to src/main/java/net/berack/upo/graph/MatrixGraph.java index b0debc1..83ddd69 100644 --- a/src/main/java/berack96/lib/graph/impl/MatrixGraph.java +++ b/src/main/java/net/berack/upo/graph/MatrixGraph.java @@ -1,10 +1,10 @@ -package berack96.lib.graph.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphDirected; +package net.berack.upo.graph; import java.util.*; +import net.berack.upo.Graph; +import net.berack.upo.GraphDirected; + /** * An implementation of the graph using a matrix for representing the edges * @@ -59,7 +59,7 @@ public class MatrixGraph extends GraphDirected { } matrix = newMatrix; - map.replaceAll((vert, index) -> index > x ? index - 1 : index); + map.replaceAll((_, index) -> index > x ? index - 1 : index); } @Override @@ -165,7 +165,7 @@ public class MatrixGraph extends GraphDirected { check(vertices); for (V vert : vertices) if (vert != null) - map.compute(vert, (v, i) -> { + map.compute(vert, (_, i) -> { if (i == null) return map.size(); removeAllEdge(vert); diff --git a/src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java b/src/main/java/net/berack/upo/graph/MatrixUndGraph.java similarity index 95% rename from src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java rename to src/main/java/net/berack/upo/graph/MatrixUndGraph.java index 459a871..4090d16 100644 --- a/src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java +++ b/src/main/java/net/berack/upo/graph/MatrixUndGraph.java @@ -1,11 +1,10 @@ -package berack96.lib.graph.impl; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphUndirected; +package net.berack.upo.graph; import java.util.*; +import net.berack.upo.Graph; +import net.berack.upo.GraphUndirected; + public class MatrixUndGraph extends GraphUndirected { Map map = getDefaultMap(); @@ -48,7 +47,7 @@ public class MatrixUndGraph extends GraphUndirected { newMatrix[i][j] = matrix[i + 1][j + (j < x ? 0 : 1)]; matrix = newMatrix; - map.replaceAll((vert, index) -> index > x ? index - 1 : index); + map.replaceAll((_, index) -> index > x ? index - 1 : index); } @Override diff --git a/src/main/java/berack96/lib/graph/Vertex.java b/src/main/java/net/berack/upo/graph/Vertex.java similarity index 98% rename from src/main/java/berack96/lib/graph/Vertex.java rename to src/main/java/net/berack/upo/graph/Vertex.java index 34e8e91..01ce6b2 100644 --- a/src/main/java/berack96/lib/graph/Vertex.java +++ b/src/main/java/net/berack/upo/graph/Vertex.java @@ -1,13 +1,13 @@ -package berack96.lib.graph; - -import berack96.lib.graph.visit.VisitStrategy; -import berack96.lib.graph.visit.impl.VisitInfo; +package net.berack.upo.graph; import java.util.ArrayList; import java.util.Collection; import java.util.Objects; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.graph.visit.VisitInfo; + /** * Class used for represent a vertex of the graph.
* The vertex contained is linked with the graph, so if any changes are made to diff --git a/src/main/java/berack96/lib/graph/visit/VisitDistSourceDest.java b/src/main/java/net/berack/upo/graph/VisitDistSourceDest.java similarity index 90% rename from src/main/java/berack96/lib/graph/visit/VisitDistSourceDest.java rename to src/main/java/net/berack/upo/graph/VisitDistSourceDest.java index 49f15ea..4569bb2 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitDistSourceDest.java +++ b/src/main/java/net/berack/upo/graph/VisitDistSourceDest.java @@ -1,10 +1,9 @@ -package berack96.lib.graph.visit; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; +package net.berack.upo.graph; import java.util.List; +import net.berack.upo.Graph; + /** * Interface that is helpful for implements visit that needs to retrieve the distance between a vertex to all the others * diff --git a/src/main/java/berack96/lib/graph/visit/VisitDistance.java b/src/main/java/net/berack/upo/graph/VisitDistance.java similarity index 94% rename from src/main/java/berack96/lib/graph/visit/VisitDistance.java rename to src/main/java/net/berack/upo/graph/VisitDistance.java index 63b6ed2..6ab2da1 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitDistance.java +++ b/src/main/java/net/berack/upo/graph/VisitDistance.java @@ -1,6 +1,4 @@ -package berack96.lib.graph.visit; - -import berack96.lib.graph.Edge; +package net.berack.upo.graph; import java.util.List; import java.util.Map; diff --git a/src/main/java/berack96/lib/graph/visit/VisitMST.java b/src/main/java/net/berack/upo/graph/VisitMST.java similarity index 84% rename from src/main/java/berack96/lib/graph/visit/VisitMST.java rename to src/main/java/net/berack/upo/graph/VisitMST.java index 7d051d8..c33cf77 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitMST.java +++ b/src/main/java/net/berack/upo/graph/VisitMST.java @@ -1,6 +1,4 @@ -package berack96.lib.graph.visit; - -import berack96.lib.graph.Edge; +package net.berack.upo.graph; import java.util.Set; diff --git a/src/main/java/berack96/lib/graph/visit/VisitSCC.java b/src/main/java/net/berack/upo/graph/VisitSCC.java similarity index 92% rename from src/main/java/berack96/lib/graph/visit/VisitSCC.java rename to src/main/java/net/berack/upo/graph/VisitSCC.java index 494e559..35d0267 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitSCC.java +++ b/src/main/java/net/berack/upo/graph/VisitSCC.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.visit; +package net.berack.upo.graph; import java.util.Set; diff --git a/src/main/java/berack96/lib/graph/visit/VisitStrategy.java b/src/main/java/net/berack/upo/graph/VisitStrategy.java similarity index 91% rename from src/main/java/berack96/lib/graph/visit/VisitStrategy.java rename to src/main/java/net/berack/upo/graph/VisitStrategy.java index db7f68d..9893b18 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitStrategy.java +++ b/src/main/java/net/berack/upo/graph/VisitStrategy.java @@ -1,11 +1,11 @@ -package berack96.lib.graph.visit; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphDirected; -import berack96.lib.graph.visit.impl.VisitInfo; +package net.berack.upo.graph; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.GraphDirected; +import net.berack.upo.graph.visit.VisitInfo; + /** * This class is used for define some strategy for the visit of a graph. * diff --git a/src/main/java/berack96/lib/graph/visit/VisitTopological.java b/src/main/java/net/berack/upo/graph/VisitTopological.java similarity index 94% rename from src/main/java/berack96/lib/graph/visit/VisitTopological.java rename to src/main/java/net/berack/upo/graph/VisitTopological.java index 6bdf42a..97ed54d 100644 --- a/src/main/java/berack96/lib/graph/visit/VisitTopological.java +++ b/src/main/java/net/berack/upo/graph/VisitTopological.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.visit; +package net.berack.upo.graph; import java.util.List; diff --git a/src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java b/src/main/java/net/berack/upo/graph/savemodels/EdgeSaveStructure.java similarity index 88% rename from src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java rename to src/main/java/net/berack/upo/graph/savemodels/EdgeSaveStructure.java index b775ab2..e853e59 100644 --- a/src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java +++ b/src/main/java/net/berack/upo/graph/savemodels/EdgeSaveStructure.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.models; +package net.berack.upo.graph.savemodels; /** * Support class used for saving a Graph in a file. diff --git a/src/main/java/berack96/lib/graph/models/GraphSaveStructure.java b/src/main/java/net/berack/upo/graph/savemodels/GraphSaveStructure.java similarity index 95% rename from src/main/java/berack96/lib/graph/models/GraphSaveStructure.java rename to src/main/java/net/berack/upo/graph/savemodels/GraphSaveStructure.java index 526e9ef..b4c7b64 100644 --- a/src/main/java/berack96/lib/graph/models/GraphSaveStructure.java +++ b/src/main/java/net/berack/upo/graph/savemodels/GraphSaveStructure.java @@ -1,13 +1,14 @@ -package berack96.lib.graph.models; +package net.berack.upo.graph.savemodels; -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.InstanceCreator; import com.google.gson.JsonSyntaxException; import com.google.gson.stream.JsonReader; +import net.berack.upo.Graph; +import net.berack.upo.graph.Edge; + import java.io.*; /** @@ -33,7 +34,7 @@ public class GraphSaveStructure { */ public final void load(Graph graph, String fileName, Class classV) throws FileNotFoundException, NullPointerException { //this way i use this class for the load - InstanceCreator> creator = type -> this; + InstanceCreator> creator = _ -> this; Gson gson = new GsonBuilder().registerTypeAdapter(this.getClass(), creator).create(); JsonReader reader = new JsonReader(new FileReader(fileName)); gson.fromJson(reader, GraphSaveStructure.class); diff --git a/src/main/java/berack96/lib/graph/models/MarkSaveStructure.java b/src/main/java/net/berack/upo/graph/savemodels/MarkSaveStructure.java similarity index 86% rename from src/main/java/berack96/lib/graph/models/MarkSaveStructure.java rename to src/main/java/net/berack/upo/graph/savemodels/MarkSaveStructure.java index 3e4ba2b..4b9cf0c 100644 --- a/src/main/java/berack96/lib/graph/models/MarkSaveStructure.java +++ b/src/main/java/net/berack/upo/graph/savemodels/MarkSaveStructure.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.models; +package net.berack.upo.graph.savemodels; /** * Support class used for saving a Graph in a file. diff --git a/src/main/java/berack96/lib/graph/view/GraphInfo.java b/src/main/java/net/berack/upo/graph/view/GraphInfo.java similarity index 94% rename from src/main/java/berack96/lib/graph/view/GraphInfo.java rename to src/main/java/net/berack/upo/graph/view/GraphInfo.java index 2eec442..8940cb4 100644 --- a/src/main/java/berack96/lib/graph/view/GraphInfo.java +++ b/src/main/java/net/berack/upo/graph/view/GraphInfo.java @@ -1,12 +1,13 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.view.edge.EdgeListener; -import berack96.lib.graph.view.vertex.VertexListener; -import berack96.lib.graph.visit.VisitStrategy; +package net.berack.upo.graph.view; import javax.swing.*; import javax.swing.border.BevelBorder; + +import net.berack.upo.Graph; +import net.berack.upo.graph.VisitStrategy; +import net.berack.upo.graph.view.edge.EdgeListener; +import net.berack.upo.graph.view.vertex.VertexListener; + import java.awt.*; import java.awt.event.ItemEvent; import java.io.IOException; @@ -91,7 +92,7 @@ public class GraphInfo extends JPanel { JLabel vEdgesOutNumber = new JLabel(); JButton modVertex = new JButton("Modify Vertices"); - modVertex.addActionListener(a -> { + modVertex.addActionListener(_ -> { comboBox.setSelectedIndex(0); listenerDescription.setText(vListener.getDescription()); graphPanel.setGraphListener(vListener); @@ -101,7 +102,7 @@ public class GraphInfo extends JPanel { }); JButton modEdge = new JButton("Modify Edges"); - modEdge.addActionListener(a -> { + modEdge.addActionListener(_ -> { comboBox.setSelectedIndex(0); listenerDescription.setText(eListener.getDescription()); graphPanel.setGraphListener(eListener); @@ -138,7 +139,7 @@ public class GraphInfo extends JPanel { /* SAVE/LOAD */ JTextField fileText = new JTextField(); JButton saveB = new JButton("Save"); - saveB.addActionListener(a -> { + saveB.addActionListener(_ -> { try { graphPanel.save(fileText.getText()); textResult.setText(""); @@ -147,7 +148,7 @@ public class GraphInfo extends JPanel { } }); JButton loadB = new JButton("Load"); - loadB.addActionListener(a -> { + loadB.addActionListener(_ -> { try { graphPanel.load(fileText.getText()); textResult.setText(""); @@ -180,7 +181,7 @@ public class GraphInfo extends JPanel { modVertex.doClick(); - graphPanel.addObserver((o, arg) -> { + graphPanel.addObserver((_, arg) -> { Graph graph = graphPanel.getGraph(); if(arg.equals(graph)) { vNumber.setText(String.valueOf(graph.size())); diff --git a/src/main/java/berack96/lib/graph/view/GraphListener.java b/src/main/java/net/berack/upo/graph/view/GraphListener.java similarity index 95% rename from src/main/java/berack96/lib/graph/view/GraphListener.java rename to src/main/java/net/berack/upo/graph/view/GraphListener.java index e3ae356..605d12f 100644 --- a/src/main/java/berack96/lib/graph/view/GraphListener.java +++ b/src/main/java/net/berack/upo/graph/view/GraphListener.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.view; +package net.berack.upo.graph.view; import java.awt.event.KeyListener; import java.awt.event.MouseListener; diff --git a/src/main/java/berack96/lib/graph/view/GraphPanel.java b/src/main/java/net/berack/upo/graph/view/GraphPanel.java similarity index 96% rename from src/main/java/berack96/lib/graph/view/GraphPanel.java rename to src/main/java/net/berack/upo/graph/view/GraphPanel.java index fe85d68..b1dbf77 100644 --- a/src/main/java/berack96/lib/graph/view/GraphPanel.java +++ b/src/main/java/net/berack/upo/graph/view/GraphPanel.java @@ -1,10 +1,4 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.Vertex; -import berack96.lib.graph.impl.MapGraph; -import berack96.lib.graph.view.edge.EdgeComponent; -import berack96.lib.graph.view.vertex.VertexComponent; +package net.berack.upo.graph.view; import java.awt.*; import java.awt.event.KeyListener; @@ -17,6 +11,12 @@ import java.util.HashSet; import java.util.Observer; import java.util.Set; +import net.berack.upo.Graph; +import net.berack.upo.graph.MapGraph; +import net.berack.upo.graph.Vertex; +import net.berack.upo.graph.view.edge.EdgeComponent; +import net.berack.upo.graph.view.vertex.VertexComponent; + @SuppressWarnings({"unchecked", "deprecation"}) public class GraphPanel extends Component { diff --git a/src/main/java/berack96/lib/graph/view/GraphPointsSave.java b/src/main/java/net/berack/upo/graph/view/GraphPointsSave.java similarity index 92% rename from src/main/java/berack96/lib/graph/view/GraphPointsSave.java rename to src/main/java/net/berack/upo/graph/view/GraphPointsSave.java index 032ce70..3e0130b 100644 --- a/src/main/java/berack96/lib/graph/view/GraphPointsSave.java +++ b/src/main/java/net/berack/upo/graph/view/GraphPointsSave.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.models.GraphSaveStructure; +package net.berack.upo.graph.view; import java.awt.*; import java.util.LinkedList; import java.util.List; +import net.berack.upo.Graph; +import net.berack.upo.graph.savemodels.GraphSaveStructure; + public class GraphPointsSave extends GraphSaveStructure { final private GraphPanel panel; diff --git a/src/main/java/berack96/lib/graph/view/GraphWindow.java b/src/main/java/net/berack/upo/graph/view/GraphWindow.java similarity index 77% rename from src/main/java/berack96/lib/graph/view/GraphWindow.java rename to src/main/java/net/berack/upo/graph/view/GraphWindow.java index 8abd77c..267369c 100644 --- a/src/main/java/berack96/lib/graph/view/GraphWindow.java +++ b/src/main/java/net/berack/upo/graph/view/GraphWindow.java @@ -1,14 +1,15 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.view.edge.EdgeListener; -import berack96.lib.graph.view.vertex.VertexListener; -import berack96.lib.graph.visit.VisitStrategy; -import berack96.lib.graph.visit.impl.BFS; -import berack96.lib.graph.visit.impl.DFS; -import berack96.lib.graph.visit.impl.Dijkstra; -import berack96.lib.graph.visit.impl.Tarjan; +package net.berack.upo.graph.view; import javax.swing.*; + +import net.berack.upo.graph.VisitStrategy; +import net.berack.upo.graph.view.edge.EdgeListener; +import net.berack.upo.graph.view.vertex.VertexListener; +import net.berack.upo.graph.visit.BFS; +import net.berack.upo.graph.visit.DFS; +import net.berack.upo.graph.visit.Dijkstra; +import net.berack.upo.graph.visit.Tarjan; + import java.awt.*; import java.io.Serial; import java.util.LinkedHashSet; diff --git a/src/main/java/berack96/lib/graph/view/GraphicalView.java b/src/main/java/net/berack/upo/graph/view/GraphicalView.java similarity index 95% rename from src/main/java/berack96/lib/graph/view/GraphicalView.java rename to src/main/java/net/berack/upo/graph/view/GraphicalView.java index a31b71c..7dbb653 100644 --- a/src/main/java/berack96/lib/graph/view/GraphicalView.java +++ b/src/main/java/net/berack/upo/graph/view/GraphicalView.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.view; +package net.berack.upo.graph.view; import java.awt.*; diff --git a/src/main/java/berack96/lib/graph/view/Main.java b/src/main/java/net/berack/upo/graph/view/Main.java similarity index 72% rename from src/main/java/berack96/lib/graph/view/Main.java rename to src/main/java/net/berack/upo/graph/view/Main.java index 776f29f..00e85e4 100644 --- a/src/main/java/berack96/lib/graph/view/Main.java +++ b/src/main/java/net/berack/upo/graph/view/Main.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.view.edge.EdgeIntListener; -import berack96.lib.graph.view.edge.EdgeView; -import berack96.lib.graph.view.vertex.VertexIntListener; -import berack96.lib.graph.view.vertex.VertexView; +package net.berack.upo.graph.view; import java.awt.*; +import net.berack.upo.graph.view.edge.EdgeIntListener; +import net.berack.upo.graph.view.edge.EdgeView; +import net.berack.upo.graph.view.vertex.VertexIntListener; +import net.berack.upo.graph.view.vertex.VertexView; + public class Main { public static void main(String[] args) { diff --git a/src/main/java/berack96/lib/graph/view/VisitListener.java b/src/main/java/net/berack/upo/graph/view/VisitListener.java similarity index 91% rename from src/main/java/berack96/lib/graph/view/VisitListener.java rename to src/main/java/net/berack/upo/graph/view/VisitListener.java index 0934977..8dcf0c1 100644 --- a/src/main/java/berack96/lib/graph/view/VisitListener.java +++ b/src/main/java/net/berack/upo/graph/view/VisitListener.java @@ -1,11 +1,12 @@ -package berack96.lib.graph.view; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.view.vertex.VertexComponent; -import berack96.lib.graph.visit.VisitStrategy; -import berack96.lib.graph.visit.impl.VisitInfo; +package net.berack.upo.graph.view; import javax.swing.*; + +import net.berack.upo.Graph; +import net.berack.upo.graph.VisitStrategy; +import net.berack.upo.graph.view.vertex.VertexComponent; +import net.berack.upo.graph.visit.VisitInfo; + import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.util.HashSet; @@ -59,7 +60,7 @@ public class VisitListener implements GraphListener { info.forEach(v -> { final boolean visited = v.timeVisited == count.get(); - Timer timer = new Timer(count.getAndIncrement() * refreshTime, e1 -> { + Timer timer = new Timer(count.getAndIncrement() * refreshTime, _ -> { if (visited && v.parent !=null) graph.mark(v.vertex, v.parent); graph.mark(v.vertex, visited ? "visited" : "discovered"); diff --git a/src/main/java/berack96/lib/graph/view/edge/EdgeComponent.java b/src/main/java/net/berack/upo/graph/view/edge/EdgeComponent.java similarity index 82% rename from src/main/java/berack96/lib/graph/view/edge/EdgeComponent.java rename to src/main/java/net/berack/upo/graph/view/edge/EdgeComponent.java index 96d68c7..7617f9f 100644 --- a/src/main/java/berack96/lib/graph/view/edge/EdgeComponent.java +++ b/src/main/java/net/berack/upo/graph/view/edge/EdgeComponent.java @@ -1,11 +1,11 @@ -package berack96.lib.graph.view.edge; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.view.vertex.VertexComponent; +package net.berack.upo.graph.view.edge; import java.awt.*; import java.io.Serial; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.view.vertex.VertexComponent; + public class EdgeComponent extends Component { @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/berack96/lib/graph/view/edge/EdgeIntListener.java b/src/main/java/net/berack/upo/graph/view/edge/EdgeIntListener.java similarity index 79% rename from src/main/java/berack96/lib/graph/view/edge/EdgeIntListener.java rename to src/main/java/net/berack/upo/graph/view/edge/EdgeIntListener.java index 4b94e18..6db7a3f 100644 --- a/src/main/java/berack96/lib/graph/view/edge/EdgeIntListener.java +++ b/src/main/java/net/berack/upo/graph/view/edge/EdgeIntListener.java @@ -1,7 +1,7 @@ -package berack96.lib.graph.view.edge; +package net.berack.upo.graph.view.edge; -import berack96.lib.graph.Vertex; -import berack96.lib.graph.view.GraphPanel; +import net.berack.upo.graph.Vertex; +import net.berack.upo.graph.view.GraphPanel; public class EdgeIntListener extends EdgeListener { diff --git a/src/main/java/berack96/lib/graph/view/edge/EdgeListener.java b/src/main/java/net/berack/upo/graph/view/edge/EdgeListener.java similarity index 94% rename from src/main/java/berack96/lib/graph/view/edge/EdgeListener.java rename to src/main/java/net/berack/upo/graph/view/edge/EdgeListener.java index 83b6286..767cd76 100644 --- a/src/main/java/berack96/lib/graph/view/edge/EdgeListener.java +++ b/src/main/java/net/berack/upo/graph/view/edge/EdgeListener.java @@ -1,14 +1,14 @@ -package berack96.lib.graph.view.edge; - -import berack96.lib.graph.Vertex; -import berack96.lib.graph.view.GraphListener; -import berack96.lib.graph.view.GraphPanel; -import berack96.lib.graph.view.vertex.VertexComponent; +package net.berack.upo.graph.view.edge; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.util.concurrent.atomic.AtomicReference; +import net.berack.upo.graph.Vertex; +import net.berack.upo.graph.view.GraphListener; +import net.berack.upo.graph.view.GraphPanel; +import net.berack.upo.graph.view.vertex.VertexComponent; + public abstract class EdgeListener implements GraphListener { private final GraphPanel graphPanel; diff --git a/src/main/java/berack96/lib/graph/view/edge/EdgeView.java b/src/main/java/net/berack/upo/graph/view/edge/EdgeView.java similarity index 97% rename from src/main/java/berack96/lib/graph/view/edge/EdgeView.java rename to src/main/java/net/berack/upo/graph/view/edge/EdgeView.java index 21e07ed..9c21420 100644 --- a/src/main/java/berack96/lib/graph/view/edge/EdgeView.java +++ b/src/main/java/net/berack/upo/graph/view/edge/EdgeView.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.view.edge; - -import berack96.lib.graph.view.GraphicalView; -import berack96.lib.graph.view.stuff.Arrow; +package net.berack.upo.graph.view.edge; import java.awt.*; import java.awt.geom.Point2D; import java.util.Collection; +import net.berack.upo.graph.view.GraphicalView; +import net.berack.upo.graph.view.polygons.Arrow; + public class EdgeView implements GraphicalView> { private static final Font FONT = new Font("Papyrus", Font.BOLD, 14); diff --git a/src/main/java/berack96/lib/graph/view/stuff/Arrow.java b/src/main/java/net/berack/upo/graph/view/polygons/Arrow.java similarity index 98% rename from src/main/java/berack96/lib/graph/view/stuff/Arrow.java rename to src/main/java/net/berack/upo/graph/view/polygons/Arrow.java index be57109..bad4abb 100644 --- a/src/main/java/berack96/lib/graph/view/stuff/Arrow.java +++ b/src/main/java/net/berack/upo/graph/view/polygons/Arrow.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.view.stuff; +package net.berack.upo.graph.view.polygons; import java.awt.*; import java.io.Serial; diff --git a/src/main/java/berack96/lib/graph/view/vertex/VertexComponent.java b/src/main/java/net/berack/upo/graph/view/vertex/VertexComponent.java similarity index 89% rename from src/main/java/berack96/lib/graph/view/vertex/VertexComponent.java rename to src/main/java/net/berack/upo/graph/view/vertex/VertexComponent.java index ae91bec..5ad0609 100644 --- a/src/main/java/berack96/lib/graph/view/vertex/VertexComponent.java +++ b/src/main/java/net/berack/upo/graph/view/vertex/VertexComponent.java @@ -1,10 +1,10 @@ -package berack96.lib.graph.view.vertex; - -import berack96.lib.graph.Vertex; +package net.berack.upo.graph.view.vertex; import java.awt.*; import java.io.Serial; +import net.berack.upo.graph.Vertex; + public class VertexComponent extends Component { @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/berack96/lib/graph/view/vertex/VertexIntListener.java b/src/main/java/net/berack/upo/graph/view/vertex/VertexIntListener.java similarity index 84% rename from src/main/java/berack96/lib/graph/view/vertex/VertexIntListener.java rename to src/main/java/net/berack/upo/graph/view/vertex/VertexIntListener.java index 316c2c4..c474485 100644 --- a/src/main/java/berack96/lib/graph/view/vertex/VertexIntListener.java +++ b/src/main/java/net/berack/upo/graph/view/vertex/VertexIntListener.java @@ -1,10 +1,10 @@ -package berack96.lib.graph.view.vertex; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.view.GraphPanel; +package net.berack.upo.graph.view.vertex; import java.util.Arrays; +import net.berack.upo.Graph; +import net.berack.upo.graph.view.GraphPanel; + public class VertexIntListener extends VertexListener { public VertexIntListener(GraphPanel panel) { diff --git a/src/main/java/berack96/lib/graph/view/vertex/VertexListener.java b/src/main/java/net/berack/upo/graph/view/vertex/VertexListener.java similarity index 93% rename from src/main/java/berack96/lib/graph/view/vertex/VertexListener.java rename to src/main/java/net/berack/upo/graph/view/vertex/VertexListener.java index c4dd7bb..47708c3 100644 --- a/src/main/java/berack96/lib/graph/view/vertex/VertexListener.java +++ b/src/main/java/net/berack/upo/graph/view/vertex/VertexListener.java @@ -1,13 +1,13 @@ -package berack96.lib.graph.view.vertex; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.view.GraphListener; -import berack96.lib.graph.view.GraphPanel; +package net.berack.upo.graph.view.vertex; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.util.concurrent.atomic.AtomicReference; +import net.berack.upo.Graph; +import net.berack.upo.graph.view.GraphListener; +import net.berack.upo.graph.view.GraphPanel; + public abstract class VertexListener implements GraphListener { protected final GraphPanel panel; diff --git a/src/main/java/berack96/lib/graph/view/vertex/VertexView.java b/src/main/java/net/berack/upo/graph/view/vertex/VertexView.java similarity index 95% rename from src/main/java/berack96/lib/graph/view/vertex/VertexView.java rename to src/main/java/net/berack/upo/graph/view/vertex/VertexView.java index 81ed773..832e0a9 100644 --- a/src/main/java/berack96/lib/graph/view/vertex/VertexView.java +++ b/src/main/java/net/berack/upo/graph/view/vertex/VertexView.java @@ -1,9 +1,9 @@ -package berack96.lib.graph.view.vertex; - -import berack96.lib.graph.view.GraphicalView; +package net.berack.upo.graph.view.vertex; import java.awt.*; +import net.berack.upo.graph.view.GraphicalView; + public class VertexView implements GraphicalView> { private static final Font FONT = new Font("Comic Sans MS", Font.BOLD, 17); diff --git a/src/main/java/berack96/lib/graph/visit/impl/BFS.java b/src/main/java/net/berack/upo/graph/visit/BFS.java similarity index 92% rename from src/main/java/berack96/lib/graph/visit/impl/BFS.java rename to src/main/java/net/berack/upo/graph/visit/BFS.java index f33aafb..6fd2557 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/BFS.java +++ b/src/main/java/net/berack/upo/graph/visit/BFS.java @@ -1,11 +1,11 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.visit.VisitStrategy; +package net.berack.upo.graph.visit; import java.util.LinkedList; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.graph.VisitStrategy; + /** * Breadth-first search
* The algorithm starts at the root node and explores all of the neighbor nodes at the present depth prior to moving on to the nodes at the next depth level. diff --git a/src/main/java/berack96/lib/graph/visit/impl/DFS.java b/src/main/java/net/berack/upo/graph/visit/DFS.java similarity index 92% rename from src/main/java/berack96/lib/graph/visit/impl/DFS.java rename to src/main/java/net/berack/upo/graph/visit/DFS.java index b6bca53..d20281b 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/DFS.java +++ b/src/main/java/net/berack/upo/graph/visit/DFS.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.visit.VisitStrategy; +package net.berack.upo.graph.visit; import java.util.Iterator; import java.util.Stack; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.graph.VisitStrategy; + /** * Depth-first search
* The algorithm starts at the root node and explores as far as possible along each branch before backtracking. diff --git a/src/main/java/berack96/lib/graph/visit/impl/Dijkstra.java b/src/main/java/net/berack/upo/graph/visit/Dijkstra.java similarity index 95% rename from src/main/java/berack96/lib/graph/visit/impl/Dijkstra.java rename to src/main/java/net/berack/upo/graph/visit/Dijkstra.java index 189fe85..6abe6d2 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/Dijkstra.java +++ b/src/main/java/net/berack/upo/graph/visit/Dijkstra.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; -import berack96.lib.graph.visit.VisitDistance; +package net.berack.upo.graph.visit; import java.util.*; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.VisitDistance; + /** * Class that implements the Dijkstra algorithm and uses it for getting all the distance from a source * diff --git a/src/main/java/berack96/lib/graph/visit/impl/Kruskal.java b/src/main/java/net/berack/upo/graph/visit/Kruskal.java similarity index 78% rename from src/main/java/berack96/lib/graph/visit/impl/Kruskal.java rename to src/main/java/net/berack/upo/graph/visit/Kruskal.java index e8c5ff3..b1be8c2 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/Kruskal.java +++ b/src/main/java/net/berack/upo/graph/visit/Kruskal.java @@ -1,15 +1,15 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphUndirected; -import berack96.lib.graph.struct.QuickFind; -import berack96.lib.graph.struct.UnionFind; -import berack96.lib.graph.visit.VisitMST; +package net.berack.upo.graph.visit; import java.util.*; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.GraphUndirected; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.VisitMST; +import net.berack.upo.graph.visit.struct.QuickFind; +import net.berack.upo.graph.visit.struct.UnionFind; + /** * Class that implement the algorithm discovered by Kruskal for the minimum spanning forest * for a given {@link GraphUndirected} diff --git a/src/main/java/berack96/lib/graph/visit/impl/Prim.java b/src/main/java/net/berack/upo/graph/visit/Prim.java similarity index 89% rename from src/main/java/berack96/lib/graph/visit/impl/Prim.java rename to src/main/java/net/berack/upo/graph/visit/Prim.java index 27ed407..db7af9f 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/Prim.java +++ b/src/main/java/net/berack/upo/graph/visit/Prim.java @@ -1,13 +1,13 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Edge; -import berack96.lib.graph.Graph; -import berack96.lib.graph.GraphUndirected; -import berack96.lib.graph.visit.VisitMST; +package net.berack.upo.graph.visit; import java.util.Set; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.GraphUndirected; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.VisitMST; + /** * Class that implement the algorithm discovered by Prim for the minimum spanning forest * for a given {@link GraphUndirected} diff --git a/src/main/java/berack96/lib/graph/visit/impl/Tarjan.java b/src/main/java/net/berack/upo/graph/visit/Tarjan.java similarity index 95% rename from src/main/java/berack96/lib/graph/visit/impl/Tarjan.java rename to src/main/java/net/berack/upo/graph/visit/Tarjan.java index 15ab7af..e5c92be 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/Tarjan.java +++ b/src/main/java/net/berack/upo/graph/visit/Tarjan.java @@ -1,12 +1,12 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.Graph; -import berack96.lib.graph.visit.VisitSCC; -import berack96.lib.graph.visit.VisitTopological; +package net.berack.upo.graph.visit; import java.util.*; import java.util.function.Consumer; +import net.berack.upo.Graph; +import net.berack.upo.graph.VisitSCC; +import net.berack.upo.graph.VisitTopological; + /** * Class that implements the Tarjan algorithm and uses it for getting the SCC and the topological sort * diff --git a/src/main/java/berack96/lib/graph/visit/impl/VisitInfo.java b/src/main/java/net/berack/upo/graph/visit/VisitInfo.java similarity index 97% rename from src/main/java/berack96/lib/graph/visit/impl/VisitInfo.java rename to src/main/java/net/berack/upo/graph/visit/VisitInfo.java index 87359e7..6384ffc 100644 --- a/src/main/java/berack96/lib/graph/visit/impl/VisitInfo.java +++ b/src/main/java/net/berack/upo/graph/visit/VisitInfo.java @@ -1,10 +1,10 @@ -package berack96.lib.graph.visit.impl; - -import berack96.lib.graph.visit.VisitStrategy; +package net.berack.upo.graph.visit; import java.util.*; import java.util.function.Consumer; +import net.berack.upo.graph.VisitStrategy; + /** * The class used for getting the info of the visit.
* It could be used with the algorithm of the visit for set some useful data. @@ -167,7 +167,7 @@ public class VisitInfo implements Iterable.VertexInfo> { * @param vertex the vertex that has been discovered */ synchronized void setDiscovered(V vertex) { - VertexInfo info = vertices.computeIfAbsent(vertex, (v) -> new VertexInfo(vertex)); + VertexInfo info = vertices.computeIfAbsent(vertex, _ -> new VertexInfo(vertex)); if(info.timeDiscovered != NOT_SET) return; @@ -231,7 +231,7 @@ public class VisitInfo implements Iterable.VertexInfo> { */ public void forEachDiscovered(Consumer consumer) { Queue queue = new PriorityQueue<>(); - vertices.forEach((v, info) -> { + vertices.forEach((_, info) -> { if (info.timeDiscovered != NOT_SET) queue.offer(new VertexInfo(info, false)); }); @@ -248,7 +248,7 @@ public class VisitInfo implements Iterable.VertexInfo> { */ public void forEachVisited(Consumer consumer) { Queue queue = new PriorityQueue<>(); - vertices.forEach((v, info) -> { + vertices.forEach((_, info) -> { if (info.timeVisited != NOT_SET) queue.offer(new VertexInfo(info, true)); }); @@ -260,7 +260,7 @@ public class VisitInfo implements Iterable.VertexInfo> { @Override public Iterator iterator() { List list = new ArrayList<>(vertices.size() * 2); - vertices.forEach((v, info) -> { + vertices.forEach((_, info) -> { if (info.timeDiscovered != NOT_SET) list.add(new VertexInfo(info, false)); if (info.timeVisited != NOT_SET) diff --git a/src/main/java/berack96/lib/graph/struct/QuickFind.java b/src/main/java/net/berack/upo/graph/visit/struct/QuickFind.java similarity index 96% rename from src/main/java/berack96/lib/graph/struct/QuickFind.java rename to src/main/java/net/berack/upo/graph/visit/struct/QuickFind.java index a2345b7..dc1db6e 100644 --- a/src/main/java/berack96/lib/graph/struct/QuickFind.java +++ b/src/main/java/net/berack/upo/graph/visit/struct/QuickFind.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.struct; +package net.berack.upo.graph.visit.struct; import java.util.Collection; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import berack96.lib.graph.Graph; +import net.berack.upo.Graph; /** * Simple implementation of the {@link UnionFind} interface with priority to the find function. diff --git a/src/main/java/berack96/lib/graph/struct/UnionFind.java b/src/main/java/net/berack/upo/graph/visit/struct/UnionFind.java similarity index 97% rename from src/main/java/berack96/lib/graph/struct/UnionFind.java rename to src/main/java/net/berack/upo/graph/visit/struct/UnionFind.java index db38669..895c985 100644 --- a/src/main/java/berack96/lib/graph/struct/UnionFind.java +++ b/src/main/java/net/berack/upo/graph/visit/struct/UnionFind.java @@ -1,4 +1,4 @@ -package berack96.lib.graph.struct; +package net.berack.upo.graph.visit.struct; import java.util.Collection; diff --git a/src/test/java/berack96/test/lib/TestGraph.java b/src/test/java/net/berack/upo/graph/test/TestGraph.java similarity index 99% rename from src/test/java/berack96/test/lib/TestGraph.java rename to src/test/java/net/berack/upo/graph/test/TestGraph.java index f2e5046..be969d0 100644 --- a/src/test/java/berack96/test/lib/TestGraph.java +++ b/src/test/java/net/berack/upo/graph/test/TestGraph.java @@ -1,17 +1,23 @@ -package berack96.test.lib; +package net.berack.upo.graph.test; -import berack96.lib.graph.*; -import berack96.lib.graph.impl.ListGraph; -import berack96.lib.graph.impl.MapGraph; -import berack96.lib.graph.impl.MatrixGraph; -import berack96.lib.graph.impl.MatrixUndGraph; -import berack96.lib.graph.models.GraphSaveStructure; -import berack96.lib.graph.struct.QuickFind; -import berack96.lib.graph.struct.UnionFind; -import berack96.lib.graph.visit.impl.BFS; -import berack96.lib.graph.visit.impl.DFS; -import berack96.lib.graph.visit.impl.VisitInfo; import com.google.gson.JsonSyntaxException; + +import net.berack.upo.Graph; +import net.berack.upo.GraphDirected; +import net.berack.upo.GraphUndirected; +import net.berack.upo.graph.Edge; +import net.berack.upo.graph.ListGraph; +import net.berack.upo.graph.MapGraph; +import net.berack.upo.graph.MatrixGraph; +import net.berack.upo.graph.MatrixUndGraph; +import net.berack.upo.graph.Vertex; +import net.berack.upo.graph.savemodels.GraphSaveStructure; +import net.berack.upo.graph.visit.BFS; +import net.berack.upo.graph.visit.DFS; +import net.berack.upo.graph.visit.VisitInfo; +import net.berack.upo.graph.visit.struct.QuickFind; +import net.berack.upo.graph.visit.struct.UnionFind; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -- 2.49.1