# HG changeset patch
# User one
# Date 1416905495 -32400
# Node ID 5e8eac03fed3cc9f73d1a51425e0cc4a1566bb93
# Parent  1bdd50e26fac6a45cf1b41accc058dd144d24c9b
miner change

diff -r 1bdd50e26fac -r 5e8eac03fed3 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/time/TimeMeasurementJuGrix.java
--- a/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/time/TimeMeasurementJuGrix.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/time/TimeMeasurementJuGrix.java	Tue Nov 25 17:51:35 2014 +0900
@@ -6,36 +6,46 @@
 import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix;
 
 public class TimeMeasurementJuGrix {
-  
-  static int roopCount = 3;
-  
+
+  static int roopCount = 10;
+
   public static void main(String args[]) {
-    
+
     System.out.println("start : ");
-    
+
     String orgId = "o:2";
     String personId = "p:1";
     LinkedList<String> filterIds = new LinkedList<String>();
     filterIds.add("r:5");
-    
+    long t2;
+    long t1;
+    t1 = System.currentTimeMillis();
+    JuGrix jugrix = new JuGrix(true);
+    t2 = System.currentTimeMillis();
+    System.out.println("create tree =" + (t2 - t1) + "s");
+    Random random = new Random();
+
+    t1 = System.currentTimeMillis();
+    functions(jugrix, orgId, personId, filterIds);
+    t2 = System.currentTimeMillis();
+    System.out.println("1回目=" + (t2 - t1) + "s");
+
     long sumTime = 0;
     for (int count = 0; count < roopCount; count++) {
 
-      JuGrix jugrix = new JuGrix();
-      Random random = new Random();
       int ran = random.nextInt(30);
       orgId = "o:" + String.valueOf(ran);
       personId = "p:" + String.valueOf(ran);
-      long t1 = System.currentTimeMillis();
+      t1 = System.currentTimeMillis();
       functions(jugrix, orgId, personId, filterIds);
-      long t2 = System.currentTimeMillis();
-     // System.out.println(count + "回目=" + (t2 - t1) + "s");
-      sumTime = sumTime + t2 - t1;
+      t2 = System.currentTimeMillis();
+      sumTime = (t2 - t1); 
+      System.out.println(count + "回目=" +sumTime + "s");
     }
-    System.out.println("合計 = " + sumTime + "s");
+    System.out.println("平均 = " + sumTime + "s");
     System.out.println("end");
   }
-  
+
   private static void functions(JuGrix jugrix, String orgId, String personId, LinkedList<String> filterIds) {
     jugrix.childOrganizationIds(orgId, filterIds);
     jugrix.competentRoleId(personId);
@@ -49,7 +59,7 @@
     jugrix.parentOrganizationIds(orgId, filterIds);
     jugrix.personIds(orgId, filterIds);
     jugrix.roleDescriptionElementIds(orgId, filterIds);
-    jugrix.roleIds(orgId);
+    jugrix.roleIds(orgId, filterIds);
     jugrix.rolePriority(personId, "r:34");
     jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ");
   }
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/GetAttributeImp.java
--- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/GetAttributeImp.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/GetAttributeImp.java	Tue Nov 25 17:51:35 2014 +0900
@@ -1,6 +1,5 @@
 package jp.ac.u_ryukyu.cr.ie.tatsuki.bbs;
 
-import java.util.Iterator;
 
 import fj.data.List;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
@@ -12,7 +11,7 @@
     node = _node;
   }
 
-  public Iterator<String> getMessage(String key) {
+  public String getMessage(String key) {
     return node.getAttributes().getString(key);
   }
   
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java
--- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java	Tue Nov 25 17:51:35 2014 +0900
@@ -13,8 +13,6 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.ParentIndex;
 
 public class JuGrix {
@@ -23,16 +21,32 @@
   JungleTree organizationTree;
   JungleTree roleTree;
   JungleTree rdeTree;
+  boolean indexFlag;
 
-  public JuGrix() {
+  public JuGrix(boolean indexFlag) {
 
     try {
+      this.indexFlag = indexFlag;
       LoadXml reader = new LoadXml();
       personTree = reader.loadTestData("Person.xml");
       organizationTree = reader.loadTestData("Organization.xml");
       roleTree = reader.loadTestData("Role.xml");
       rdeTree = reader.loadTestData("RoleDescriptionElement.xml");
 
+      if (indexFlag) {
+        InterfaceTraverser traverser = personTree.getTraverser(indexFlag);
+        Iterator<TreeNode> emptyIterator = traverser.emptyQuery();
+        emptyIterator.hasNext();
+        traverser = organizationTree.getTraverser(indexFlag);
+        emptyIterator = traverser.emptyQuery();
+        emptyIterator.hasNext();
+        traverser = roleTree.getTraverser(indexFlag);
+        emptyIterator = traverser.emptyQuery();
+        emptyIterator.hasNext();
+        traverser = rdeTree.getTraverser(indexFlag);
+        emptyIterator = traverser.emptyQuery();
+        emptyIterator.hasNext();
+      }
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -40,7 +54,7 @@
 
   public boolean isActive(String id) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser();
+    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
     Iterator<TreeNode> personIdpairIterator = personTraverser.find((TreeNode node) -> {
       String personId = node.getAttributes().getString("Person-id");
       if (personId == null)
@@ -58,7 +72,7 @@
 
   public Iterator<String> personIds(String orgId, LinkedList<String> filterIds) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser();
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
 
     Iterator<TreeNode> orgIdNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
@@ -84,7 +98,7 @@
     if (!filter(filterIds, orgRoleId))
       return new NullIterator<String>();
 
-    InterfaceTraverser traverser = personTree.getTraverser();
+    InterfaceTraverser traverser = personTree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
       Iterator<TreeNode> orgIdNodeIterator = traverser.find((TreeNode node) -> {
@@ -143,7 +157,7 @@
 
   public Iterator<String> searchPersonRoleIds(JungleTree tree, String id, String element, LinkedList<String> filterIds) {
 
-    InterfaceTraverser traverser = tree.getTraverser();
+    InterfaceTraverser traverser = tree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
 
@@ -192,7 +206,6 @@
         for (; OrganizationMappedByRoleIterator.hasNext();) {
           TreeNode OrganizationMappedByRole = OrganizationMappedByRoleIterator.next();
           TreeNode organizationRefIdNode = OrganizationMappedByRole.getChildren().at(0).b();
-          System.out.println(organizationRefIdNode.getAttributes().getString("element"));
           String organizationRefId = organizationRefIdNode.getAttributes().getString("text-organizationRefId");
           if (!filterIds.contains(organizationRefId))
             continue;
@@ -224,7 +237,7 @@
 
   public Iterator<String> searchOrgRoleIds(JungleTree tree, String id, String element, LinkedList<String> filterIds) {
 
-    InterfaceTraverser traverser = tree.getTraverser();
+    InterfaceTraverser traverser = tree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
 
@@ -301,7 +314,7 @@
 
   public Iterator<String> competentRoleId(String personId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser();
+    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
 
@@ -362,7 +375,7 @@
 
   public Iterator<String> concurrentRoleIds(String personId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser();
+    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
 
@@ -567,7 +580,7 @@
 
   public Iterator<TreeNode> childOrganizationIdsNode(String orgId) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser();
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
 
     return new Iterator<TreeNode>() {
       TreeNode childOrgNode;
@@ -641,7 +654,6 @@
   }
 
   private boolean orgNodefilter(LinkedList<String> filterIds, TreeNode orgNode) {
-    System.out.println(orgNode.getAttributes().getString("element"));
     String orgId = orgNode.getAttributes().getString("text-organizationRefId");
 
     return filter(filterIds, orgId);
@@ -675,7 +687,7 @@
   }
 
   private String getRole(String orgId) {
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser();
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
     Iterator<TreeNode> orgNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
       if (nodeElement == null)
@@ -702,7 +714,7 @@
 
   private boolean getRde(String roleId, String filterId) {
 
-    InterfaceTraverser roleTraverser = roleTree.getTraverser();
+    InterfaceTraverser roleTraverser = roleTree.getTraverser(indexFlag);
     Iterator<TreeNode> rdeIdNodeIterator = roleTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
       if (nodeElement == null)
@@ -724,7 +736,6 @@
       for (; roleDescriptionElementRefIdIterator.hasNext();) {
         String roleDescriptionElementRefId = roleDescriptionElementRefIdIterator.next().getAttributes()
             .getString("text-roleDescriptionElementRefId");
-        System.out.println(roleDescriptionElementRefId);
         if (roleDescriptionElementRefId.equals(filterId))
           return true;
       }
@@ -734,7 +745,7 @@
 
   public TreeMap<String, String> _childOrganizationIds(String orgId, TreeMap<String, String> childOrgIdsTreeMap) {
 
-    InterfaceTraverser orgTraverser = organizationTree.getTraverser();
+    InterfaceTraverser orgTraverser = organizationTree.getTraverser(indexFlag);
 
     Iterator<TreeNode> orgIdNodeIterator = orgTraverser.find((TreeNode node) -> {
       String nodeElement = node.getAttributes().getString("element");
@@ -806,7 +817,7 @@
 
   public String rolePriority(String personId, String roleId) {
 
-    InterfaceTraverser personTraverser = personTree.getTraverser();
+    InterfaceTraverser personTraverser = personTree.getTraverser(indexFlag);
 
     Iterator<TreeNode> roleIdNodeIterator = personTraverser.find((TreeNode node) -> {
       String element = node.getAttributes().getString("element");
@@ -942,7 +953,7 @@
         if (roleMacher.find()) {
           element = "Person";
           pos = 5;
-          return personTree.getTraverser();
+          return personTree.getTraverser(indexFlag);
         }
 
         Pattern rdePattern = Pattern.compile("o:");
@@ -950,7 +961,7 @@
         if (rdeMacher.find()) {
           element = "Organization";
           pos = 4;
-          return organizationTree.getTraverser();
+          return organizationTree.getTraverser(indexFlag);
         }
         return null;
       }
@@ -994,8 +1005,8 @@
   public Iterator<String> deepParentOrganizationIdsPlus(String id, LinkedList<String> filterIds) {
 
     return new Iterator<String>() {
+      Iterator<String> parentOrgIdIterator = deepParentOrganizationIds(id, filterIds);
       String parentOrgId = initOrgId();
-      Iterator<String> parentOrgIdIterator = deepParentOrganizationIds(id, filterIds);
 
       @Override
       public boolean hasNext() {
@@ -1036,11 +1047,11 @@
     InterfaceTraverser traverser = null;
     String elementName = null;
     if (splitPath[0].equals("r")) {
-      traverser = roleTree.getTraverser();
+      traverser = roleTree.getTraverser(indexFlag);
       elementName = "Role";
     }
     if (splitPath[0].equals("rde")) {
-      traverser = rdeTree.getTraverser();
+      traverser = rdeTree.getTraverser(indexFlag);
       elementName = "RoleDescriptionElement";
     }
 
@@ -1100,7 +1111,7 @@
 
   private Iterator<String> getRde(String roleId) {
 
-    InterfaceTraverser traverser = roleTree.getTraverser();
+    InterfaceTraverser traverser = roleTree.getTraverser(indexFlag);
 
     return new Iterator<String>() {
 
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java
--- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/ShowMatrix.java	Tue Nov 25 17:51:35 2014 +0900
@@ -90,11 +90,8 @@
 		List<String> keys = attribute.getKeys();
 		
 		for (String key : keys) {
-		  Iterator<String> attributeIterator = attribute.getMessage(key);
-		  for (;attributeIterator.hasNext();) {
-			_pw.write(key + " : " + bbs.sanitize(attributeIterator.next()) + "<br>");
-		  }
-			
+		  String mesage = attribute.getMessage(key);
+			_pw.write(key + " : " + bbs.sanitize(mesage) + "<br>");		
 		}
 		
 		_pw.write("</body></html>");
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ChildOrganizationIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ChildOrganizationIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ChildOrganizationIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -12,7 +12,7 @@
 
   @Test
   public void childOrganizationIdsTest() {
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     LinkedList<String> list = new LinkedList<String>();
     list.add("r:11");
     Iterator<String> ids = jugrix.childOrganizationIds("o:2", list);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/CompetentRoleIdTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/CompetentRoleIdTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/CompetentRoleIdTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -12,7 +12,7 @@
 	@Test
 	public void testCompetentRoleIdTest(){
 		
-	  JuGrix jugrix = new JuGrix();
+	  JuGrix jugrix = new JuGrix(true);
 		Iterator<String> roleIds = jugrix.competentRoleId("p:1");
 		Assert.assertTrue(roleIds.hasNext());
 		Assert.assertEquals(roleIds.next(), "r:10");
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ConcurrentRoleIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ConcurrentRoleIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ConcurrentRoleIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -11,7 +11,7 @@
 
   @Test
   public void testConcurrentRoleId() {
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     Iterator<String> roleIds = jugrix.concurrentRoleIds("p:1");
     Assert.assertTrue(roleIds.hasNext());
     Assert.assertEquals(roleIds.next(), "r:34");
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsPlusTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -13,7 +13,7 @@
   @Test
   public void TestDeepChildOrganizationIdsPlus() {
 
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
       LinkedList<String> filterIds = new LinkedList<String>();
       Iterator<String> childrenIds = jugrix.deepChildOrganizationIdsPlus("o:2", filterIds);
       Assert.assertTrue(childrenIds.hasNext());
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepChildOrganizationIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -13,7 +13,7 @@
   @Test
   public void TestDeepChildOrganizationIds() {
     
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     LinkedList<String> filterIds = new LinkedList<String>();
     filterIds.add("r:11");
     Iterator<String> childrenIds = jugrix.deepChildOrganizationIds("o:2", filterIds);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsPlusTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsPlusTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsPlusTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -11,7 +11,7 @@
 public class DeepParentOrganizationIdsPlusTest {
 	@Test
 	public void deepParentOrganizationIdsPlus(){
-		JuGrix jugrix = new JuGrix();
+		JuGrix jugrix = new JuGrix(true);
 		LinkedList<String> filterIds = new LinkedList<String>();
 		Iterator<String> childrenIds = jugrix.deepParentOrganizationIdsPlus("o:2", filterIds);
 
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepParentOrganizationIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -12,7 +12,7 @@
 
   @Test
   public void deepParentOrganizationIds() {
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     LinkedList<String> filterIds = new LinkedList<String>();
     Iterator<String> childrenIds = jugrix.deepParentOrganizationIds("o:2", filterIds);
     Assert.assertTrue(childrenIds.hasNext());
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepPersonIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepPersonIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/DeepPersonIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -10,7 +10,7 @@
 public class DeepPersonIdsTest {
 	@Test
 	public void TestDeepPersonIds(){
-		JuGrix jugrix = new JuGrix();
+		JuGrix jugrix = new JuGrix(true);
 		LinkedList<String> filterIds = new LinkedList<String>();
 		//filterIds.add("r:9");
 		Iterator<String> ids = jugrix.deepPersonIds("o:2",filterIds);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/IsActiveTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/IsActiveTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/IsActiveTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -11,7 +11,7 @@
     @Test
     public void TestIsActive(){
 
-            JuGrix jugrix = new JuGrix(); 
+            JuGrix jugrix = new JuGrix(true); 
             String personId = "p:1";
             
             Assert.assertTrue(jugrix.isActive(personId));
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ParentOrganizationIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ParentOrganizationIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/ParentOrganizationIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -11,7 +11,7 @@
 public class ParentOrganizationIdsTest {
 	@Test
 	public void testParentOrganizationIds() {
-		JuGrix jugrix = new JuGrix();
+		JuGrix jugrix = new JuGrix(true);
 		LinkedList<String> filterIds = new LinkedList<String>();
 		filterIds.add("r:2");
 		Iterator<String> childrenIds = jugrix.parentOrganizationIds("o:2", filterIds);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/PersonIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -14,7 +14,7 @@
   @Test
   public void testPersonIds() {
 
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     LinkedList<String> filterIds = new LinkedList<String>();
     
     Iterator<String> ids = jugrix.personIds("o:2", filterIds);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleDescriptionElementIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleDescriptionElementIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleDescriptionElementIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -12,7 +12,7 @@
 
 	@Test
 	public void testRoleDescriptionElementIds(){
-		JuGrix jugrix = new JuGrix();
+		JuGrix jugrix = new JuGrix(true);
 		LinkedList<String> ids = new LinkedList<String>();
 		//ids.add("o:34");
 		Iterator<String> rdeIds = jugrix.roleDescriptionElementIds("o:2",ids);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RoleIdsTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -12,7 +12,7 @@
 
   @Test
   public void testRoleIds() {
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     LinkedList<String> filterIds = new LinkedList<String>();
     filterIds.add("o:5");
     Iterator<String> orgIds = jugrix.roleIds("o:6",filterIds);
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RolePriorityTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RolePriorityTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/RolePriorityTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -9,7 +9,7 @@
 
 	@Test
 	public void testRolePriority(){
-		JuGrix jugrix = new JuGrix();
+		JuGrix jugrix = new JuGrix(true);
 		String priority = jugrix.rolePriority("p:1", "r:34");
 		Assert.assertEquals(priority,"1");
 	}
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/StringPathToIdTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/StringPathToIdTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/StringPathToIdTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -8,7 +8,7 @@
 public class StringPathToIdTest {
   @Test
   public void testStringPathToId() {
-    JuGrix jugrix = new JuGrix();
+    JuGrix jugrix = new JuGrix(true);
     String id = jugrix.stringPathToId("r:path:エスアールエルテクノシステム/臨検システム部/業務システムグループ");
     Assert.assertEquals(id, "r:43");
     id = jugrix.stringPathToId("rde:path:システム開発申請書/組織的役割/起票部署");
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -11,7 +11,7 @@
     @Test
     public void Readml(){
         long t1 = System.currentTimeMillis();
-        new JuGrix();
+        new JuGrix(true);
         long t2 = System.currentTimeMillis();
         System.out.println(t2 - t1 + "s");
     }
diff -r 1bdd50e26fac -r 5e8eac03fed3 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java
--- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java	Tue Nov 25 12:12:17 2014 +0900
+++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java	Tue Nov 25 17:51:35 2014 +0900
@@ -9,12 +9,10 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 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.traverser.DefaultTraverser;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
 import junit.framework.Assert;
 
 class SaxTest {
@@ -27,7 +25,7 @@
 			TestHandler testHandler = new TestHandler(tree);
 			saxParser.parse(new FileInputStream("xml/sample.xml"), testHandler);
 			JungleTree newTree = testHandler.getTree();
-			InterfaceTraverser ifTraverser = newTree.getTraverser();
+			InterfaceTraverser ifTraverser = newTree.getTraverser(false);
 
 			Iterator<TreeNode> searchNodeIterator = ifTraverser.find((
 					TreeNode node) -> {