Refactor some method names

Author: Plastix

src/main/java/io/github/plastix/Main.java

@@ -41,8 +41,8 @@ private static void setupSolver() throws GRBException {
             double edgeScore = graphUtils.getArcScore(edges);
             double edgeDist = edges.getDistance();
 
-            GRBVar forward = vars.getArc(edges);
-            GRBVar backward = vars.getComplementArc(edges);
+            GRBVar forward = vars.getArcVar(edges);
+            GRBVar backward = vars.getComplementArcVar(edges);
 
             objective.addTerm(edgeScore, forward);
             objective.addTerm(edgeScore, backward);
@@ -67,12 +67,12 @@ private static void setupSolver() throws GRBException {
             EdgeIterator incoming = graphUtils.incomingEdges(i);
             while(incoming.next()) {
                 incomingIds.add(incoming.getEdge());
-                edgeCounts.addTerm(1, vars.getArc(incoming));
+                edgeCounts.addTerm(1, vars.getArcVar(incoming));
             }
 
             EdgeIterator outgoing = graphUtils.outgoingEdges(i);
             while(outgoing.next()) {
-                GRBVar arc = vars.getArc(outgoing);
+                GRBVar arc = vars.getArcVar(outgoing);
                 // Check if we already recorded it as an incoming edge
                 if(incomingIds.contains(outgoing.getEdge())) {
                     edgeCounts.remove(arc);
@@ -87,15 +87,15 @@ private static void setupSolver() throws GRBException {
             GRBLinExpr vertexVisits = new GRBLinExpr();
             outgoing = graphUtils.outgoingEdges(i);
             while(outgoing.next()) {
-                vertexVisits.addTerm(1, vars.getArc(outgoing));
+                vertexVisits.addTerm(1, vars.getArcVar(outgoing));
             }
-            vertexVisits.addTerm(-1, vars.getVertex(i));
+            vertexVisits.addTerm(-1, vars.getVertexVar(i));
             model.addConstr(vertexVisits, GRB.EQUAL, 0, "vertex_visits");
         }
 
         // (1h)/(1i)
-        // Start vertex can only be visited once
-        GRBVar startNode = vars.getVertex(START_NODE_ID);
+        // Start vertex must be visited exactly once
+        GRBVar startNode = vars.getVertexVar(START_NODE_ID);
         startNode.set(GRB.DoubleAttr.LB, 1);
         startNode.set(GRB.DoubleAttr.UB, 1);
 

src/main/java/io/github/plastix/SubtourConstraint.java

@@ -44,11 +44,11 @@ protected void callback() {
                         EdgeIterator outgoing = graphUtils.outgoingEdges(vertexId);
 
                         while(outgoing.next()) {
-                            subtourConstraint.addTerm(1, vars.getArc(outgoing));
+                            subtourConstraint.addTerm(1, vars.getArcVar(outgoing));
                             totalOutgoingEdges += 1;
                         }
 
-                        sumVertexVisits += getSolution(vars.getVertex(vertexId));
+                        sumVertexVisits += getSolution(vars.getVertexVar(vertexId));
                     }
 
                     double rhs = ((double) sumVertexVisits) / ((double) totalOutgoingEdges);
@@ -64,7 +64,7 @@ protected void callback() {
     }
 
     private int numVerticesInSolution() throws GRBException {
-        double[] values = getSolution(vars.getVerts());
+        double[] values = getSolution(vars.getVertexVars());
 
         int visited = 0;
         for(double value : values) {
@@ -88,7 +88,7 @@ private IntHashSet getReachableVertexSubset(int startNode) throws GRBException {
                 EdgeIterator iter = explorer.setBaseNode(current);
                 while(iter.next()) {
                     int connectedId = iter.getAdjNode();
-                    if(getSolution(vars.getArc(iter)) > 0) {
+                    if(getSolution(vars.getArcVar(iter)) > 0) {
                         stack.addLast(connectedId);
                     }
                 }

src/main/java/io/github/plastix/Vars.java

@@ -73,19 +73,19 @@ private int getIndex(EdgeIterator edge) {
         return arcBaseIds[edge.getEdge()] == edge.getBaseNode() ? 0 : 1;
     }
 
-    public GRBVar getArc(EdgeIterator edge) {
+    public GRBVar getArcVar(EdgeIterator edge) {
         return arcs[edge.getEdge()][getIndex(edge)];
     }
 
-    public GRBVar getComplementArc(EdgeIterator edge) {
+    public GRBVar getComplementArcVar(EdgeIterator edge) {
         return arcs[edge.getEdge()][getIndex(edge) ^ 1];
     }
 
-    public GRBVar getVertex(int id) {
+    public GRBVar getVertexVar(int id) {
         return verts[id];
     }
 
-    public GRBVar[] getVerts() {
+    public GRBVar[] getVertexVars() {
         return verts;
     }
 }