From a43d8d6dcd09b6af7488f611688c659ab0b69306 Mon Sep 17 00:00:00 2001 From: "guyslain.naves" <guyslain.naves@lis-lab.fr> Date: Tue, 15 Nov 2022 15:07:36 +0100 Subject: [PATCH] remove some warnings and inspection problems --- src/main/java/fr/univamu/graph/UndirectedGraph.java | 4 +--- src/main/java/fr/univamu/graph/generators/ErdosRenyi.java | 2 -- src/main/java/fr/univamu/graph/rootedtrees/NodeStats.java | 3 --- src/main/java/fr/univamu/graph/rootedtrees/RootedTree.java | 3 +-- src/main/java/fr/univamu/graph/search/Search.java | 6 +++--- src/main/java/fr/univamu/helpers/Iterations.java | 4 +--- .../fr/univamu/visualizer/RainbowDrawingParameters.java | 3 +-- src/main/java/module-info.java | 2 +- 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/main/java/fr/univamu/graph/UndirectedGraph.java b/src/main/java/fr/univamu/graph/UndirectedGraph.java index 4ed46bc..89907d7 100644 --- a/src/main/java/fr/univamu/graph/UndirectedGraph.java +++ b/src/main/java/fr/univamu/graph/UndirectedGraph.java @@ -3,8 +3,6 @@ package fr.univamu.graph; import fr.univamu.helpers.Iterations; import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; @@ -15,7 +13,7 @@ public class UndirectedGraph { private int order; private int edgeCardinality; - List<List<Edge>> adjacencies; + final List<List<Edge>> adjacencies; public boolean isVertex(int index) { diff --git a/src/main/java/fr/univamu/graph/generators/ErdosRenyi.java b/src/main/java/fr/univamu/graph/generators/ErdosRenyi.java index 01c7c55..a1c0b4e 100644 --- a/src/main/java/fr/univamu/graph/generators/ErdosRenyi.java +++ b/src/main/java/fr/univamu/graph/generators/ErdosRenyi.java @@ -4,9 +4,7 @@ import fr.univamu.graph.EmbeddedGraph; import fr.univamu.graph.UndirectedGraph; import fr.univamu.helpers.Point; -import java.util.ArrayList; import java.util.Random; -import java.util.function.Supplier; public class ErdosRenyi implements EmbeddedGraph { diff --git a/src/main/java/fr/univamu/graph/rootedtrees/NodeStats.java b/src/main/java/fr/univamu/graph/rootedtrees/NodeStats.java index b58dfe7..cf25f7a 100644 --- a/src/main/java/fr/univamu/graph/rootedtrees/NodeStats.java +++ b/src/main/java/fr/univamu/graph/rootedtrees/NodeStats.java @@ -24,7 +24,6 @@ public class NodeStats { public NodeStats(RootedTree tree) { - this.tree = tree; int maxVertex = tree.maxNode(); for (int vertex = 0; vertex < maxVertex + 1; vertex++) { stats.add(null); @@ -33,8 +32,6 @@ public class NodeStats { } - - private final RootedTree tree; private final List<Stats> stats = new ArrayList<>(); private record Stats(int height, int depth, int degree, int size) { diff --git a/src/main/java/fr/univamu/graph/rootedtrees/RootedTree.java b/src/main/java/fr/univamu/graph/rootedtrees/RootedTree.java index 3f99417..2a7edaa 100644 --- a/src/main/java/fr/univamu/graph/rootedtrees/RootedTree.java +++ b/src/main/java/fr/univamu/graph/rootedtrees/RootedTree.java @@ -27,7 +27,7 @@ public record RootedTree(int root, List<RootedTree> children) } public Iterable<RootedTree> bfsIterable() { - return this::iterator; + return this; } public Iterable<RootedTree> dfsIterable() { @@ -77,7 +77,6 @@ public record RootedTree(int root, List<RootedTree> children) .filter(v -> !rootParent.equals(Optional.of(v))) .map(v -> getNode(v,graph,toParent)) .toList(); - ; return new RootedTree(root, children); } diff --git a/src/main/java/fr/univamu/graph/search/Search.java b/src/main/java/fr/univamu/graph/search/Search.java index 1f18cd4..532b654 100644 --- a/src/main/java/fr/univamu/graph/search/Search.java +++ b/src/main/java/fr/univamu/graph/search/Search.java @@ -66,9 +66,9 @@ public class Search { } private final UndirectedGraph graph; - Frontier frontier; - BitSet reached; - List<Path> paths; + final Frontier frontier; + final BitSet reached; + final List<Path> paths; private void process(Path path) { diff --git a/src/main/java/fr/univamu/helpers/Iterations.java b/src/main/java/fr/univamu/helpers/Iterations.java index 13f9b8a..27d9745 100644 --- a/src/main/java/fr/univamu/helpers/Iterations.java +++ b/src/main/java/fr/univamu/helpers/Iterations.java @@ -1,7 +1,5 @@ package fr.univamu.helpers; -import fr.univamu.graph.rootedtrees.RootedTree; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -91,7 +89,7 @@ public class Iterations { public static <T> Iterable<T> concat(Iterable<? extends Iterable<T>> iterables) { return () -> new Iterator<T>() { - private Iterator<? extends Iterable<T>> futureIterators = iterables.iterator(); + private final Iterator<? extends Iterable<T>> futureIterators = iterables.iterator(); private Iterator<T> currentIterator; { prepareNext(); } diff --git a/src/main/java/fr/univamu/visualizer/RainbowDrawingParameters.java b/src/main/java/fr/univamu/visualizer/RainbowDrawingParameters.java index d6b6759..640db59 100644 --- a/src/main/java/fr/univamu/visualizer/RainbowDrawingParameters.java +++ b/src/main/java/fr/univamu/visualizer/RainbowDrawingParameters.java @@ -52,7 +52,6 @@ public class RainbowDrawingParameters implements DrawingParameters { double saturation = 0.7; double brightness = Math.min(100.0, params.brightnessSlope * height + params.minBrightness) / 100.0; - Color col = Color.hsb(hue, saturation, brightness); - return col; + return Color.hsb(hue, saturation, brightness); } } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 1211298..c809107 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,5 +1,5 @@ module fr.univamu.randomtree { - requires javafx.controls; + requires javafx.graphics; requires javafx.fxml; -- GitLab