# HG changeset patch
# User suruga
# Date 1499518013 -32400
# Node ID 74401cc27a965f2657f012feb140d62ae5164da1
# Parent  2f037b8f6b927cd6f7fdc83a2743e5d388c36d0f
fix log again

diff -r 2f037b8f6b92 -r 74401cc27a96 src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataReadBenchMark.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataReadBenchMark.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataReadBenchMark.java	Sat Jul 08 21:46:53 2017 +0900
@@ -1,12 +1,13 @@
 package jp.ac.u_ryukyu.ie.cr.benchMark.persistent;
 
 import jp.ac.u_ryukyu.ie.cr.jungle.Jungle;
+import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeListReader;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.NodePath;
-import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkNodePath;
@@ -26,9 +27,9 @@
 
     public static void main(String[] args) throws IOException {
 
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/commit.log"));
+        PersistentJournal journal1 = new PersistentJournal("commit.log");
         Jungle jungle = new PersistentJungle(journal1, "uuid", new DefaultTraverser());
-        Jungle jungle2 = new PersistentJungle(journal1, "uuid3", new DefaultTraverser());
+        Jungle jungle2 = new PersistentJungle(journal1, "uuid3",new DefaultTraverser());
         Long t1;
         Long t2;
         PrintWriter readTimeWriter = new PrintWriter(new BufferedWriter(new FileWriter(new File("./time/readTime"))));
@@ -56,20 +57,19 @@
             System.out.println("write time = " + (t2 - t1));
 
             PersistentJournal journal2 = new PersistentJournal();
-            journal2.setInputFile(new File("./log/" + journal1.getLogName()));
-            journal2.setOutputFile(new File("./log/" + journal1.getLogName()));
+            journal2.setInputFile(new File( journal1.getLogName()));
+            journal2.setOutputFile(new File( journal1.getLogName()));
             ChangeListReader reader = journal2.getReader();
 
             t1 = System.currentTimeMillis();
             for (ChangeList chList : reader) {
                 String treeName = chList.getTreeName();
-                int treeType = chList.getTreeType();
                 JungleTree tree2 = jungle2.getTreeByName(treeName);
                 if (tree2 == null) {
                     tree2 = jungle2.createNewTree(treeName);
                 }
                 JungleTreeEditor editor2 = tree2.getJungleTreeEditor();
-                Either<Error, JungleTreeEditor> either2 = JungleUpdater.edit(editor2, chList,treeType);
+                Either<Error, JungleTreeEditor> either2 = JungleUpdater.edit(editor2, chList);
                 Assert.assertFalse(either2.isA());
                 editor2 = either2.b();
                 editor2.success();
diff -r 2f037b8f6b92 -r 74401cc27a96 src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataWriteBenchMark.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataWriteBenchMark.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/DataWriteBenchMark.java	Sat Jul 08 21:46:53 2017 +0900
@@ -1,10 +1,11 @@
 package jp.ac.u_ryukyu.ie.cr.benchMark.persistent;
 
 import jp.ac.u_ryukyu.ie.cr.jungle.Jungle;
-import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.DefaultNodePath;
+import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.DefaultNodePath;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.PersistentJournal;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.PersistentJungle;
 
@@ -15,7 +16,7 @@
 
     public static void main(String[] args) throws FileNotFoundException {
 
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/CommitTest.log"));
+        PersistentJournal journal1 = new PersistentJournal("CommitTest.log");
         Jungle jungle = new PersistentJungle(journal1, "uuid",new DefaultTraverser());
         jungle.createNewTree("testTree");
         JungleTree tree = jungle.getTreeByName("testTree");
diff -r 2f037b8f6b92 -r 74401cc27a96 src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/JungleLogCopyBenchMark.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/JungleLogCopyBenchMark.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/benchMark/persistent/JungleLogCopyBenchMark.java	Sat Jul 08 21:46:53 2017 +0900
@@ -1,10 +1,11 @@
 package jp.ac.u_ryukyu.ie.cr.benchMark.persistent;
 
 import jp.ac.u_ryukyu.ie.cr.jungle.Jungle;
-import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.NodePath;
+import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.NodePath;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkNodePath;
@@ -25,8 +26,8 @@
     static int pos = 0;
 
     public static void main(String[] args) throws IOException {
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/commit.log"));
-        Jungle jungle = new PersistentJungle(journal1, "uuid", new DefaultTraverser());
+        PersistentJournal journal1 = new PersistentJournal("commit.log");
+        Jungle jungle = new PersistentJungle(journal1, "uuid",new DefaultTraverser());
         Long t1;
         Long t2;
         PrintWriter readTimeWriter = new PrintWriter(new BufferedWriter(new FileWriter(new File("./time/copyTime"))));
diff -r 2f037b8f6b92 -r 74401cc27a96 src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/DataWriteBufferTest.java
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/DataWriteBufferTest.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/DataWriteBufferTest.java	Sat Jul 08 21:46:53 2017 +0900
@@ -1,14 +1,15 @@
 package jp.ac.u_ryukyu.ie.cr.junglenetwork;
 
 import jp.ac.u_ryukyu.ie.cr.jungle.Jungle;
+import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.core.Children;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeListReader;
 import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.NodePath;
-import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor;
+import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkNodePath;
@@ -30,8 +31,8 @@
 
     @Test
     public void DataWriteBufferTest() throws IOException {
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/commit.log"));
-        Jungle jungle = new PersistentJungle(journal1, "uuid", new DefaultTraverser());
+        PersistentJournal journal1 = new PersistentJournal("commit.log");
+        Jungle jungle = new PersistentJungle(journal1, "uuid",new DefaultTraverser());
         jungle.createNewTree("hoge");
         JungleTree tree1 = jungle.getTreeByName("hoge");
         tree1.setBufferSize(10);
@@ -47,8 +48,8 @@
         Assert.assertFalse(either.isA());
 
         PersistentJournal journal2 = new PersistentJournal();
-        journal2.setInputFile(new File("./log/" + journal1.getLogName()));
-        journal2.setOutputFile(new File("./log/" + journal1.getLogName()));
+        journal2.setInputFile(new File( journal1.getLogName()));
+        journal2.setOutputFile(new File( journal1.getLogName()));
         ChangeListReader reader = journal2.getReader();
         Iterator<ChangeList> iterator = reader.iterator();
         Assert.assertFalse(iterator.hasNext());
@@ -69,19 +70,18 @@
         Assert.assertFalse(either.isA());
 
         PersistentJournal journal3 = new PersistentJournal();
-        journal3.setInputFile(new File("./log/" + journal1.getLogName()));
-        journal3.setOutputFile(new File("./log/" + journal1.getLogName()));
-        Jungle jungle2 = new PersistentJungle(journal1, "uuid3", new DefaultTraverser());
+        journal3.setInputFile(new File( journal1.getLogName()));
+        journal3.setOutputFile(new File( journal1.getLogName()));
+        Jungle jungle2 = new PersistentJungle(journal1, "uuid3",new DefaultTraverser());
         ChangeListReader reader2 = journal3.getReader();
         for (ChangeList chList : reader2) {
             String treeName = chList.getTreeName();
-            int treeType = chList.getTreeType();
             JungleTree tree2 = jungle2.getTreeByName(treeName);
             if (tree2 == null) {
                 tree2 = jungle2.createNewTree(treeName);
             }
             editor2 = tree2.getJungleTreeEditor();
-            Either<Error, JungleTreeEditor> either2 = JungleUpdater.edit(editor2, chList,treeType);
+            Either<Error, JungleTreeEditor> either2 = JungleUpdater.edit(editor2, chList);
             Assert.assertFalse(either2.isA());
             editor2 = either2.b();
             editor2.success();
diff -r 2f037b8f6b92 -r 74401cc27a96 src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDefaultJournalTest.java
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDefaultJournalTest.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDefaultJournalTest.java	Sat Jul 08 21:46:53 2017 +0900
@@ -24,7 +24,7 @@
 public class PersistentDefaultJournalTest extends TestCase {
 
     public void testPersistentJounal() throws IOException {
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/commit.log"));
+        PersistentJournal journal1 = new PersistentJournal("commit.log");
         Jungle jungle = new PersistentJungle(journal1, "uuid", new DefaultTraverser());
         jungle.createNewTree("hoge");
         JungleTree tree1 = jungle.getTreeByName("hoge");
@@ -43,8 +43,8 @@
         assertFalse(either.isA());
 
         PersistentJournal journal2 = new PersistentJournal();
-        journal2.setInputFile(new File("./log/" + journal1.getLogName()));
-        journal2.setOutputFile(new File("./log/" + journal1.getLogName()));
+        journal2.setInputFile(new File( journal1.getLogName()));
+        journal2.setOutputFile(new File(journal1.getLogName()));
         Jungle jungle2 = new PersistentJungle(journal1, "uuid2", new DefaultTraverser());
         ChangeListReader reader = journal2.getReader();
         for (ChangeList chList : reader) {
diff -r 2f037b8f6b92 -r 74401cc27a96 src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDifferentialJournalTest.java
--- a/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDifferentialJournalTest.java	Sat Jul 08 21:08:16 2017 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/junglenetwork/Persistent/PersistentDifferentialJournalTest.java	Sat Jul 08 21:46:53 2017 +0900
@@ -30,7 +30,7 @@
 public class PersistentDifferentialJournalTest extends TestCase {
 
     public void testPersistentJounal() throws IOException {
-        PersistentJournal journal1 = new PersistentJournal(new File("./log/commit.log"));
+        PersistentJournal journal1 = new PersistentJournal("commit.log");
         Jungle jungle = new PersistentJungle(journal1, "uuid", new DefaultTraverser());
         jungle.createNewDifferenceTree("hoge");
         JungleTree tree1 = jungle.getTreeByName("hoge");
@@ -51,8 +51,8 @@
             assertFalse(either.isA());
         }
         PersistentJournal journal2 = new PersistentJournal();
-        journal2.setInputFile(new File("./log/" + journal1.getLogName()));
-        journal2.setOutputFile(new File("./log/" + journal1.getLogName()));
+        journal2.setInputFile(new File(journal1.getLogName()));
+        journal2.setOutputFile(new File(journal1.getLogName()));
         Jungle jungle2 = new PersistentJungle(journal1, "uuid2", new DefaultTraverser());
         ChangeListReader reader = journal2.getReader();
         for (ChangeList chList : reader) {