simplify DistanceCalculatorInRootedTree by forcing use specific implementation (SegmentTreeByArrayImplementation)

kongbomb · kongbomb · commit 447463ea709c · 2018-08-16T14:51:13.000+09:00
diff --git a/src/main/java/org/psjava/algo/graph/DistanceCalculatorInRootedTree.java b/src/main/java/org/psjava/algo/graph/DistanceCalculatorInRootedTree.java
@@ -10,7 +10,7 @@
 import org.psjava.ds.numbersystrem.AddInvert;
 import org.psjava.ds.numbersystrem.AddableNumberSystem;
 import org.psjava.ds.tree.segmenttree.SegmentTree;
-import org.psjava.ds.tree.segmenttree.SegmentTreeFactory;
+import org.psjava.ds.tree.segmenttree.SegmentTreeByArrayImplementation;
 import org.psjava.util.VisitorStopper;
 
 import java.util.function.Function;
@@ -19,12 +19,10 @@
 public class DistanceCalculatorInRootedTree {
 
     private final LowestCommonAncestorAlgorithm lca;
-    private final SegmentTreeFactory segmentTreeFactory;
     private final MutableMapFactory mapFactory;
 
-    public DistanceCalculatorInRootedTree(LowestCommonAncestorAlgorithm lca, SegmentTreeFactory segmentTreeFactory, MutableMapFactory mapFactory) {
+    public DistanceCalculatorInRootedTree(LowestCommonAncestorAlgorithm lca, MutableMapFactory mapFactory) {
         this.lca = lca;
-        this.segmentTreeFactory = segmentTreeFactory;
         this.mapFactory = mapFactory;
     }
 
@@ -57,7 +55,7 @@ public void onWalkUp(E edge) {
             }
         });
 
-        final SegmentTree<W> segmentTree = segmentTreeFactory.create(pathWeights, ns::add);
+        final SegmentTree<W> segmentTree = new SegmentTreeByArrayImplementation<>(pathWeights, ns::add);
         final LowestCommonAncestorQuerySession<V> lcaSession = lca.calc(tree);
 
         return new DistanceCalculatorInRootedTreeResult<V, W>() {
diff --git a/src/test/java/org/psjava/algo/graph/DistanceCalculatorInRootedTreeTest.java b/src/test/java/org/psjava/algo/graph/DistanceCalculatorInRootedTreeTest.java
@@ -7,13 +7,12 @@
 import org.psjava.ds.numbersystrem.IntegerNumberSystem;
 import org.psjava.goods.GoodLowestCommonAncestorAlgorithm;
 import org.psjava.goods.GoodMutableMapFactory;
-import org.psjava.goods.GoodSegmentTreeFactory;
 
 import static org.junit.Assert.assertEquals;
 
 public class DistanceCalculatorInRootedTreeTest {
 
-    private static final DistanceCalculatorInRootedTree INSTANCE = new DistanceCalculatorInRootedTree(GoodLowestCommonAncestorAlgorithm.getInstrance(), GoodSegmentTreeFactory.getInstance(), GoodMutableMapFactory.getInstance());
+    private static final DistanceCalculatorInRootedTree INSTANCE = new DistanceCalculatorInRootedTree(GoodLowestCommonAncestorAlgorithm.getInstrance(), GoodMutableMapFactory.getInstance());
 
     @Test
     public void testCalc() {
