moving specialized classes into own package

karussell · Jul 16, 2012 · b320569 · b320569
1 parent da6d534
commit b320569
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/core/src/main/java/de/jetsli/graph/routing/DijkstraBidirectionRef.java b/core/src/main/java/de/jetsli/graph/routing/DijkstraBidirectionRef.java
@@ -33,20 +33,20 @@
  * @author Peter Karich, info@jetsli.de
  */
 public class DijkstraBidirectionRef implements RoutingAlgorithm {
-
+    
     private int from, to;
-    private Graph graph;
-    protected Edge currFrom;
-    protected Edge currTo;
-    protected PathWrapperRef shortest;
-    protected TIntObjectMap<Edge> shortestDistMapOther;
+    private Graph graph;    
     private MyBitSet visitedFrom;
     private PriorityQueue<Edge> openSetFrom;
     private TIntObjectMap<Edge> shortestDistMapFrom;
     private MyBitSet visitedTo;
     private PriorityQueue<Edge> openSetTo;
     private TIntObjectMap<Edge> shortestDistMapTo;
     private boolean alreadyRun;
+    protected Edge currFrom;
+    protected Edge currTo;    
+    protected TIntObjectMap<Edge> shortestDistMapOther;
+    public PathWrapperRef shortest;
 
     public DijkstraBidirectionRef(Graph graph) {
         this.graph = graph;

diff --git a/...graph/routing/DijkstraMultipleAtOnce.java → ...ing/rideshare/DijkstraMultipleAtOnce.java b/...graph/routing/DijkstraMultipleAtOnce.java → ...ing/rideshare/DijkstraMultipleAtOnce.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
 import de.jetsli.graph.storage.MemoryGraph;
 

diff --git a/...aph/routing/DijkstraShortestOf2ToPub.java → ...g/rideshare/DijkstraShortestOf2ToPub.java b/...aph/routing/DijkstraShortestOf2ToPub.java → ...g/rideshare/DijkstraShortestOf2ToPub.java
@@ -13,10 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
 import de.jetsli.graph.coll.MyBitSet;
 import de.jetsli.graph.coll.MyOpenBitSet;
+import de.jetsli.graph.routing.DijkstraBidirection;
+import de.jetsli.graph.routing.Path;
+import de.jetsli.graph.routing.PathWrapperRef;
+import de.jetsli.graph.routing.RoutingAlgorithm;
 import de.jetsli.graph.storage.Graph;
 import de.jetsli.graph.storage.Edge;
 import de.jetsli.graph.util.EdgeIdIterator;

diff --git a/...sli/graph/routing/DijkstraTwoDrivers.java → ...routing/rideshare/DijkstraTwoDrivers.java b/...sli/graph/routing/DijkstraTwoDrivers.java → ...routing/rideshare/DijkstraTwoDrivers.java
@@ -13,8 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
+import de.jetsli.graph.routing.DijkstraBidirectionRef;
+import de.jetsli.graph.routing.Path;
 import de.jetsli.graph.storage.Graph;
 import de.jetsli.graph.storage.Edge;
 

diff --git a/...sli/graph/routing/DijkstraWhichToOne.java → ...routing/rideshare/DijkstraWhichToOne.java b/...sli/graph/routing/DijkstraWhichToOne.java → ...routing/rideshare/DijkstraWhichToOne.java
@@ -13,11 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
 import de.jetsli.graph.storage.DistEntry;
 import de.jetsli.graph.coll.MyBitSet;
 import de.jetsli.graph.coll.MyOpenBitSet;
+import de.jetsli.graph.routing.Path;
+import de.jetsli.graph.routing.PathWrapperRef;
+import de.jetsli.graph.routing.RoutingAlgorithm;
 import de.jetsli.graph.storage.Graph;
 import de.jetsli.graph.storage.Edge;
 import de.jetsli.graph.util.EdgeIdIterator;

diff --git a/core/src/test/java/de/jetsli/graph/routing/AbstractRoutingAlgorithmTester.java b/core/src/test/java/de/jetsli/graph/routing/AbstractRoutingAlgorithmTester.java
@@ -37,7 +37,7 @@
  */
 public abstract class AbstractRoutingAlgorithmTester {
 
-    static Graph matrixGraph;
+    public static Graph matrixGraph;
 
     static {
         matrixGraph = createMatrixAlikeGraph();

diff --git a/...routing/DijkstraShortestOf2ToPubTest.java → ...deshare/DijkstraShortestOf2ToPubTest.java b/...routing/DijkstraShortestOf2ToPubTest.java → ...deshare/DijkstraShortestOf2ToPubTest.java
@@ -13,13 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
-import de.jetsli.graph.routing.DijkstraShortestOf2ToPub;
 import de.jetsli.graph.routing.DijkstraBidirection;
-import de.jetsli.graph.routing.RoutingAlgorithm;
-import de.jetsli.graph.routing.DijkstraWhichToOne;
 import de.jetsli.graph.routing.Path;
+import de.jetsli.graph.routing.RoutingAlgorithm;
 import de.jetsli.graph.storage.MemoryGraph;
 import de.jetsli.graph.storage.Graph;
 import org.junit.Test;

diff --git a/...graph/routing/DijkstraTwoDriversTest.java → ...ing/rideshare/DijkstraTwoDriversTest.java b/...graph/routing/DijkstraTwoDriversTest.java → ...ing/rideshare/DijkstraTwoDriversTest.java
@@ -13,10 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
+import de.jetsli.graph.routing.AbstractRoutingAlgorithmTester;
 import de.jetsli.graph.routing.DijkstraBidirection;
-import de.jetsli.graph.routing.DijkstraTwoDrivers;
 import de.jetsli.graph.routing.Path;
 import de.jetsli.graph.storage.Graph;
 import gnu.trove.set.TIntSet;

diff --git a/...graph/routing/DijkstraWhichToOneTest.java → ...ing/rideshare/DijkstraWhichToOneTest.java b/...graph/routing/DijkstraWhichToOneTest.java → ...ing/rideshare/DijkstraWhichToOneTest.java
@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package de.jetsli.graph.routing;
+package de.jetsli.graph.routing.rideshare;
 
+import de.jetsli.graph.routing.AbstractRoutingAlgorithmTester;
 import de.jetsli.graph.routing.DijkstraBidirection;
-import de.jetsli.graph.routing.RoutingAlgorithm;
-import de.jetsli.graph.routing.DijkstraWhichToOne;
 import de.jetsli.graph.routing.Path;
+import de.jetsli.graph.routing.RoutingAlgorithm;
 import de.jetsli.graph.storage.Graph;
 import org.junit.Test;
 import static org.junit.Assert.*;