diff src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementCreateIndex.java @ 20:195c1a644550

benchmark add
author tatsuki
date Tue, 17 Mar 2015 15:37:19 +0900
parents 917ecf2c7350
children c8d8864714d4
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementCreateIndex.java	Sun Feb 15 02:06:57 2015 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementCreateIndex.java	Tue Mar 17 15:37:19 2015 +0900
@@ -11,9 +11,12 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeContext;
 import org.xml.sax.SAXException;
 
+import fj.Ord;
 import fj.data.List;
+import fj.data.TreeMap;
 import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.ReadXmlHandler;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungleTree;
@@ -22,16 +25,14 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.NullJournal;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultChangeSet;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.Index;
 import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.ParentIndex;
 
 public class TimeMeasurementCreateIndex {
@@ -63,7 +64,7 @@
     }
   }
 
-  private static JungleTree createJungleTree(String name) {
+  private static JungleTree createJungleTree(final String name) {
     ChangeList list = new ChangeList() {
       @Override
       public Iterator<TreeOperation> iterator() {
@@ -84,11 +85,11 @@
     };
 
     DefaultTreeNode root = new DefaultTreeNode();
-    Index index = new Index();
+    TreeMap<String, TreeMap<String, TreeMap<TreeNode, TreeNode>>> indexList = TreeMap.empty(Ord.stringOrd);
+ //   TreeMap<TreeNode, TreeNode> parentIndex = new ParentIndex().getParentIndex();
     ParentIndex parentIndex = new ParentIndex();
-    ChangeSet set = new DefaultChangeSet(root, null, list, "hoge", name, 0, index.getIndex(),
+    TreeContext tc = new DefaultTreeContext(root, null, list, "hoge", name, 0, indexList,
         parentIndex.getParentIndex());
-    DefaultTreeContext tc = new DefaultTreeContext(root, set);
     JungleTree newTree = new DefaultJungleTree(tc, "hoge", new NullJournal().getWriter(), new DefaultTreeEditor(
         new DefaultTraverser()));
     return newTree;