Check for unnecessary code

Author: RolandKluge

org.cobolt.algorithms/src/org/cobolt/algorithms/helpers/LogicHelper.java

@@ -1,31 +1,15 @@
 package org.cobolt.algorithms.helpers;
 
-public class LogicHelper {
+class LogicHelper {
 
 	/**
 	 * Returns the logic implication of the given premise and conclusion variables
-	 * 
+	 *
 	 * @param premise
 	 * @param conclusion
 	 * @return premise => conclusion
 	 */
-	public static boolean implies(boolean premise, boolean conclusion) {
+	static boolean implies(final boolean premise, final boolean conclusion) {
 		return !premise || conclusion;
 	}
-
-	/**
-	 * Implementation of the biimplication operator
-	 * 
-	 * The result is (<code>a</code> AND <code>b</code>) OR (!<code>a</code> AND
-	 * !<code>b</code>)
-	 * 
-	 * @param a
-	 *            the premise value
-	 * @param b
-	 *            the conclusion value
-	 * @return whether implication holds
-	 */
-	public static boolean biimplies(boolean a, boolean b) {
-		return a == b;
-	}
 }

org.cobolt.model/src/org/cobolt/model/listener/LoggingGraphContentAdapter.java

@@ -1,13 +1,5 @@
 package org.cobolt.model.utils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.cobolt.model.Edge;
 import org.cobolt.model.EdgeState;
 import org.cobolt.model.Node;
@@ -87,67 +79,6 @@ public static Edge addUndirectedEdge(final Topology topology, final String idFwd
 		return addUndirectedEdge(topology, idFwd, idBwd, node1, node2, distance, Double.NaN);
 	}
 
-	/**
-	 * Creates a summary of the edge states of the given {@link Topology}.
-	 *
-	 * For instance, this method can be used during debugging as follows:
-	 *
-	 * de.tudarmstadt.maki.tc.cbctc.model.utils.TopologyUtils.formatEdgeStateReport(unclassifiedEdge.getTopology())
-	 *
-	 * de.tudarmstadt.maki.tc.cbctc.model.utils.TopologyUtils.formatEdgeStateReport(topology)
-	 *
-	 * @param topology
-	 * @return
-	 */
-	public static String formatEdgeStateReport(final Topology topology) {
-		final StringBuilder builder = new StringBuilder();
-		final Set<Edge> processedEdges = new HashSet<>();
-		final List<Edge> edges = new ArrayList<>(topology.getEdges());
-		edges.sort(new Comparator<Edge>() {
-			@Override
-			public int compare(final Edge o1, final Edge o2) {
-				return o1.getId().compareTo(o2.getId());
-			}
-
-		});
-		final Map<EdgeState, Integer> stateCounts = new HashMap<>();
-		stateCounts.put(EdgeState.ACTIVE, 0);
-		stateCounts.put(EdgeState.INACTIVE, 0);
-		stateCounts.put(EdgeState.UNCLASSIFIED, 0);
-
-		for (final Edge link : edges) {
-			if (!processedEdges.contains(link)) {
-				final Edge revLink = link.getReverseEdge();
-				final EdgeState linkState = link.getState();
-				builder.append(String.format("%6s", link.getId()) + " : " + linkState.toString().substring(0, 1));
-				processedEdges.add(link);
-				stateCounts.put(linkState, stateCounts.get(linkState) + 1);
-
-				if (revLink != null) {
-					final EdgeState revLinkState = revLink.getState();
-					builder.append(" || " + String.format("%6s", revLink.getId()) + " : "
-							+ revLinkState.toString().substring(0, 1));
-					processedEdges.add(revLink);
-					stateCounts.put(revLinkState, stateCounts.get(revLinkState) + 1);
-				}
-
-				builder.append("\n");
-
-			}
-		}
-
-		builder.insert(0, String.format("#A : %d || #I : %d || #U : %d || Sum : %d\n", //
-				stateCounts.get(EdgeState.ACTIVE), //
-				stateCounts.get(EdgeState.INACTIVE), //
-				stateCounts.get(EdgeState.UNCLASSIFIED), //
-				stateCounts.get(EdgeState.ACTIVE) + stateCounts.get(EdgeState.INACTIVE)
-						+ stateCounts.get(EdgeState.UNCLASSIFIED)//
-		));
-
-		return builder.toString().trim();
-
-	}
-
 	/**
 	 * Returns true if the topology contains at least one unclassified edge
 	 *

org.cobolt.model/src/org/cobolt/model/utils/TopologyUtils.java

@@ -28,7 +28,6 @@
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
 import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.EdgeID;
-import de.tudarmstadt.maki.simonstrator.api.common.graph.GraphElementProperty;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.IEdge;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.IElement;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.INode;
@@ -53,7 +52,7 @@ public class EMoflonFacade extends TopologyControlFacade_ImplBase {
 
 	public static final Double DEFAULT_VALUE_FOR_UNDEFINED_ATTRIBUTES = Double.NaN;
 
-	public static final int DEFAULT_VALUE_FOR_UNDEFINED_HOP_COUNT = -1;
+	private static final int DEFAULT_VALUE_FOR_UNDEFINED_HOP_COUNT = -1;
 
 	private final Topology topology;
 
@@ -142,11 +141,6 @@ private TopologyControlOperationMode mapOperationMode(
 		}
 	}
 
-	@Override
-	public void run() {
-		this.run(new TopologyControlAlgorithmParamters());
-	}
-
 	@Override
 	public void run(final TopologyControlAlgorithmParamters parameters) {
 		if (this.algorithm instanceof AbstractKTC) {
@@ -443,16 +437,6 @@ public <T> void updateModelNodeAttribute(final Node modelNode, final SiSType<T>
 		}
 	}
 
-	/**
-	 * Calls {@link #updateModelLinkAttribute(Edge, GraphElementProperty, Object)}
-	 * for the given link and its reverse link, setting the same value for the given
-	 * property on both links.
-	 */
-	public <T> void updateModelLinkAttributeSymmetric(final Edge modelEdge, final SiSType<T> property, final T value) {
-		updateModelLinkAttribute(modelEdge, property, value);
-		updateModelLinkAttribute(modelEdge.getReverseEdge(), property, value);
-	}
-
 	/**
 	 * Sets the property of the given link to the given value.
 	 *

org.cobolt.simbridge/src/main/java/org/cobolt/algorithms/facade/EMoflonFacade.java

@@ -8,10 +8,10 @@
 
 /**
  * Helper class for algorithms in the {@link EMoflonFacade}
- * 
+ *
  * @author Roland Kluge - Initial implementation
  */
-public class EMoflonFacadeAlgorithmHelper {
+class EMoflonFacadeAlgorithmHelper {
 
 	/**
 	 * Maps the given {@link TopologyControlAlgorithmID} to an (executable)

org.cobolt.simbridge/src/main/java/org/cobolt/algorithms/facade/EMoflonFacadeAlgorithmHelper.java

@@ -10,14 +10,14 @@
  * 
  * @author Roland Kluge - Initial implementation
  */
-public class EMoflonFacadeAttributeHelper {
+class EMoflonFacadeAttributeHelper {
 	private static final EdgeState DEFAULT_VALUE_FOR_UNDEFINED_EDGE_STATE = EdgeState.UNCLASSIFIED;
 
 	private EMoflonFacadeAttributeHelper() {
 		throw new UnsupportedOperationException();
 	}
 
-	static EdgeState getEdgeStateSafe(IEdge prototype) {
+	static EdgeState getEdgeStateSafe(final IEdge prototype) {
 		final de.tudarmstadt.maki.simonstrator.tc.underlay.EdgeState value = prototype
 				.getProperty(UnderlayTopologyProperties.EDGE_STATE);
 		if (value != null)
@@ -26,7 +26,7 @@ static EdgeState getEdgeStateSafe(IEdge prototype) {
 			return DEFAULT_VALUE_FOR_UNDEFINED_EDGE_STATE;
 	}
 
-	private static EdgeState mapToModelEdgeState(de.tudarmstadt.maki.simonstrator.tc.underlay.EdgeState value) {
+	private static EdgeState mapToModelEdgeState(final de.tudarmstadt.maki.simonstrator.tc.underlay.EdgeState value) {
 		switch (value) {
 		case ACTIVE:
 			return EdgeState.ACTIVE;

org.cobolt.simbridge/src/main/java/org/cobolt/algorithms/facade/EMoflonFacadeAttributeHelper.java

@@ -6,12 +6,12 @@
 
 /**
  * Helper class for graph constraints in the {@link EMoflonFacade}
- * 
+ *
  * @author Roland Kluge - Initial implementation
  */
-public class EMoflonFacadeConstraintsHelper {
+class EMoflonFacadeConstraintsHelper {
 
-	public static EdgeStateBasedConnectivityConstraint createPhysicalConnectivityConstraint() {
+	static EdgeStateBasedConnectivityConstraint createPhysicalConnectivityConstraint() {
 		final EdgeStateBasedConnectivityConstraint constraint = ConstraintsFactory.eINSTANCE
 				.createEdgeStateBasedConnectivityConstraint();
 		constraint.getStates().add(EdgeState.ACTIVE);
@@ -20,7 +20,7 @@ public static EdgeStateBasedConnectivityConstraint createPhysicalConnectivityCon
 		return constraint;
 	}
 
-	public static EdgeStateBasedConnectivityConstraint createWeakConnectivityConstraint() {
+	static EdgeStateBasedConnectivityConstraint createWeakConnectivityConstraint() {
 		final EdgeStateBasedConnectivityConstraint constraint = ConstraintsFactory.eINSTANCE
 				.createEdgeStateBasedConnectivityConstraint();
 		constraint.getStates().add(EdgeState.ACTIVE);

org.cobolt.simbridge/src/main/java/org/cobolt/algorithms/facade/EMoflonFacadeConstraintsHelper.java

@@ -12,7 +12,7 @@
 
 import de.tudarmstadt.maki.simonstrator.api.util.UtilityClassNotInstantiableException;
 
-public final class TopologyModelGraphTIO {
+final class TopologyModelGraphTIO {
 	public TopologyModelGraphTIO() {
 		throw new UtilityClassNotInstantiableException();
 	}
@@ -35,8 +35,8 @@ static Map<String, EStructuralFeature> initializeAttributeIdentifierMapping() {
 		return modelAttributeMapping;
 	}
 
-	static Object convertToObject(String attributeValue, String attributeIdentifier, Topology topology,
-			TopologyElement topologyElement) {
+	static Object convertToObject(final String attributeValue, final String attributeIdentifier,
+			final Topology topology, final TopologyElement topologyElement) {
 		switch (attributeIdentifier) {
 		case "a":
 		case "d":
@@ -68,7 +68,7 @@ static Object convertToObject(String attributeValue, String attributeIdentifier,
 		}
 	}
 
-	static EdgeState parseEdgeState(String stateIdentifier) {
+	private static EdgeState parseEdgeState(final String stateIdentifier) {
 		switch (stateIdentifier) {
 		case "A":
 			return EdgeState.ACTIVE;

org.cobolt.simbridge/src/main/java/org/cobolt/algorithms/io/TopologyModelGraphTIO.java

@@ -30,37 +30,37 @@ public TopologyModelGraphTReader() {
 
 	/**
 	 * Reads a GraphT file from the given file into the given topology
-	 * 
+	 *
 	 * @param topology
-	 *            the {@link Topology} to fill
+	 *                     the {@link Topology} to fill
 	 * @param filename
-	 *            the file name to read from
+	 *                     the file name to read from
 	 */
 	public void read(final Topology topology, final String filename) throws FileNotFoundException {
 		this.read(topology, new File(filename));
 	}
 
 	/**
 	 * Reads a GraphT file from the given file into the given topology
-	 * 
+	 *
 	 * @param topology
-	 *            the {@link Topology} to fill
+	 *                      the {@link Topology} to fill
 	 * @param inputFile
-	 *            the file to read from
+	 *                      the file to read from
 	 */
-	public void read(final Topology topology, final File inputFile) throws FileNotFoundException {
+	private void read(final Topology topology, final File inputFile) throws FileNotFoundException {
 		this.read(topology, new FileInputStream(inputFile));
 	}
 
 	/**
 	 * Reads a GraphT file from the given stream into the given topology
-	 * 
+	 *
 	 * @param topology
-	 *            the {@link Topology} to fill
+	 *                     the {@link Topology} to fill
 	 * @param stream
-	 *            the stream to read from
+	 *                     the stream to read from
 	 */
-	public void read(final Topology topology, final InputStream stream) {
+	private void read(final Topology topology, final InputStream stream) {
 		Scanner scanner = null;
 
 		try {
@@ -140,7 +140,7 @@ public void read(final Topology topology, final InputStream stream) {
 	}
 
 	private void parseAttributeSpecification(final TopologyElement topologyElement, final String attributeSpec,
-			Topology topology) {
+			final Topology topology) {
 		final String[] attributeEntry = attributeSpec.split(Pattern.quote("="));
 		if (attributeEntry.length != 2)
 			throw new IllegalArgumentException(String.format("Invalid attribute specification: '%s'", attributeSpec));