changeset 306:0d11fd054893

Red Black Tree fix
author tatsuki
date Wed, 25 Jan 2017 21:18:13 +0900
parents c8a9bc5243a9
children 5b9a3bc593a7
files src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java
diffstat 7 files changed, 23 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/logger/TreeOperationLog.java	Wed Jan 25 21:18:13 2017 +0900
@@ -6,7 +6,7 @@
 
 public interface TreeOperationLog extends Iterable<TreeOperation>
 {
-	public TreeOperationLog add(NodePath _p,NodeOperation _op);
+	public TreeOperationLog add(NodePath _p, NodeOperation _op);
 	public TreeOperationLog append(TreeOperationLog _log);
 	public int length();
 }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/nodepath/NodePath.java	Wed Jan 25 21:18:13 2017 +0900
@@ -2,13 +2,19 @@
 
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Pair;
 
-public interface NodePath extends Iterable<Integer>
-{
-	public int get(int index);
-	public NodePath add(int pos);
-	public Pair<Integer,NodePath> pop();
-	public NodePath tail();
-	public int size();
-	public Pair<Integer,NodePath> last();
+
+public interface NodePath extends Iterable<Integer> {
+    public int get(int index);
+
+    public NodePath add(int pos);
+
+    public Pair<Integer, NodePath> pop();
+
+    public NodePath tail();
+
+    public int size();
+
+    public Pair<Integer, NodePath> last();
+
     public NodePath addHead(int pos);
-}
+}
\ No newline at end of file
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/store/operations/DefaultTreeOperation.java	Wed Jan 25 21:18:13 2017 +0900
@@ -7,7 +7,7 @@
 	private final NodePath path;
 	private final NodeOperation operation;
 	
-	public DefaultTreeOperation(NodePath _path,NodeOperation _operation)
+	public DefaultTreeOperation(NodePath _path, NodeOperation _operation)
 	{
 		path = _path;
 		operation = _operation;
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/DifferenceTreeEditor.java	Wed Jan 25 21:18:13 2017 +0900
@@ -20,7 +20,7 @@
     }
 
     @Override
-    public Either<Error, LoggingNode> edit(TreeNode subTreeRoot,  NodePath path, NodeEditor editor) {
+    public Either<Error, LoggingNode> edit(TreeNode subTreeRoot, NodePath path, NodeEditor editor) {
         Evaluator evalutor = new DefaultEvaluator(path);
         Either<Error,Traversal> traverseEither =  traverser.traverse(subTreeRoot, evalutor);
         if (traverseEither.isA()) {
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungle/transaction/editor/treeEditor/TreeEditor.java	Wed Jan 25 21:18:13 2017 +0900
@@ -9,5 +9,5 @@
 
 public interface TreeEditor
 {
-	public Either<Error, LoggingNode> edit(TreeNode root,  NodePath path, NodeEditor editor) ;
+	public Either<Error, LoggingNode> edit(TreeNode root, NodePath path, NodeEditor editor) ;
 }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/persistent/PersistentJungleTreeEditor.java	Wed Jan 25 21:18:13 2017 +0900
@@ -96,7 +96,7 @@
     }
 
     @Override
-    public Either<Error, JungleTreeEditor> moveChild(NodePath path,int childNum, String move) {
+    public Either<Error, JungleTreeEditor> moveChild(NodePath path, int childNum, String move) {
         MoveChild movechild = new MoveChild(move, childNum);
         return _edit(path,movechild);
     }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java	Wed Jan 25 06:15:48 2017 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/jungleNetwork/transaction/NetworkDefaultJungleTreeEditor.java	Wed Jan 25 21:18:13 2017 +0900
@@ -63,7 +63,7 @@
 		return treeEditor;
 	}
 	
-	private Either<Error,JungleTreeEditor> _edit(final NodePath _path,NodeEditor _e)
+	private Either<Error,JungleTreeEditor> _edit(final NodePath _path, NodeEditor _e)
 	{
 		Either<Error, LoggingNode> editEither = editor.edit(root, _path, _e);
 		if(editEither.isA()){
@@ -119,7 +119,7 @@
 	}
 
 	@Override
-	public Either<Error,JungleTreeEditor> putAttribute(NodePath _path,String _key,ByteBuffer _value)
+	public Either<Error,JungleTreeEditor> putAttribute(NodePath _path, String _key, ByteBuffer _value)
 	{
 		PutAttribute putAttribute = new PutAttribute(_key,_value);
 		return _edit(_path,putAttribute);
@@ -139,7 +139,7 @@
 	}
 
 	@Override
-	public Either<Error,JungleTreeEditor> edit(NodePath _path,NodeEditor _editor)
+	public Either<Error,JungleTreeEditor> edit(NodePath _path, NodeEditor _editor)
 	{
 		return _edit(_path,_editor);
 	}