Mercurial > hg > Members > tatsuki > jungle-bench

changeset 11:cc219065cea3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error fix
author one
date Tue, 25 Nov 2014 12:07:55 +0900
parents 2af5af044947
children 33b15ef21dcd
files .settings/org.eclipse.jdt.core.prefs src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/CreateXML.java src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/Index.java src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/UpdateXml.java
diffstat 4 files changed, 53 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/.settings/org.eclipse.jdt.core.prefs	Tue Nov 18 15:09:50 2014 +0900
+++ b/.settings/org.eclipse.jdt.core.prefs	Tue Nov 25 12:07:55 2014 +0900
@@ -1,5 +1,11 @@
-#Tue Mar 04 02:20:13 JST 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/CreateXML.java	Tue Nov 18 15:09:50 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/CreateXML.java	Tue Nov 25 12:07:55 2014 +0900
@@ -15,7 +15,6 @@
       PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(file)));
       pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
       int nodeCount = put(pw, 0, "", 0);
-
       pw.close();
       System.out.println(nodeCount);
     } catch (IOException e) {
@@ -27,8 +26,9 @@
     nodeCount++;
     pw.println(str + "<element id = \"" + deep + "\">");
     String newStr = str + "  ";
+    System.out.println("deep = " + deep);
     deep++;
-    if (deep < 20) {
+    if (deep < 17) {
       nodeCount = put(pw, deep, newStr, nodeCount);
       nodeCount = put(pw, deep, newStr, nodeCount);
     }
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/Index.java	Tue Nov 18 15:09:50 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/Index.java	Tue Nov 25 12:07:55 2014 +0900
@@ -11,10 +11,8 @@
 
 import fj.data.List;
 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.TreeNode;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
 import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.LoadXml;
 
 public class Index {
@@ -22,16 +20,10 @@
   public static void main(String args[]) throws FileNotFoundException, SAXException, IOException,
       ParserConfigurationException {
 
-    LoadXml readerIndex = new LoadXml();
-
-    JungleTree personTreeIndex = readerIndex.loadTestDataCreateIndex("test.xml");
-    InterfaceTraverser traverserIndex = personTreeIndex.getTraverser();
-    search(traverserIndex, "Index");
-
-    // LoadXml reader = new LoadXml();
-    // JungleTree personTree = reader.loadTestData("test.xml");
-    // InterfaceTraverser traverser = personTree.getTraverser();
-    // search(traverser, "Normal");
+    LoadXml reader = new LoadXml();
+    JungleTree personTree = reader.loadTestData("test.xml");
+    InterfaceTraverser traverser = personTree.getTraverser();
+    search(traverser, "Normal");
     System.out.println("test");
 
   }
@@ -47,23 +39,23 @@
 
     for (String attribute : str) {
 
-      Iterator<Pair<TreeNode, NodePath>> pair = traverser.find((TreeNode node) -> {
-        Iterator<String> element = node.getAttributes().getString("element");
-        if (!element.hasNext())
+      Iterator<TreeNode> targetNode = traverser.find((TreeNode node) -> {
+        String element = node.getAttributes().getString("element");
+        if (element == null)
           return false;
-        if (!element.next().equals("element"))
+        if (!element.equals("element"))
           return false;
 
-        Iterator<String> id = node.getAttributes().getString("element-id");
-        if (!id.hasNext())
+        String id = node.getAttributes().getString("element-id");
+        if (id == null)
           return false;
-        if (id.next().equals(attribute))
+        if (id.equals(attribute))
           return true;
         return false;
       }, "element-id", attribute);
 
-      for (; pair.hasNext();) {
-        pair.next();
+      for (; targetNode.hasNext();) {
+        targetNode.next();
       }
     }
     long t2 = System.currentTimeMillis();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/oldTree/UpdateXml.java	Tue Nov 25 12:07:55 2014 +0900
@@ -0,0 +1,28 @@
+package jp.ac.u_ryukyu.ie.cr.tatsuki.oldTree;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.SAXException;
+
+import ac.jp.u_ryukyu.cr.ie.tatsuki.xmlReader.UpdateXmlHundler;
+
+public class UpdateXml {
+  public static void main(String args[]) throws ParserConfigurationException, SAXException, IOException {
+    for (String xml : args) {
+      SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+      SAXParser saxParser = saxParserFactory.newSAXParser();
+      UpdateXmlHundler updateXmlHandler = new UpdateXmlHundler(xml);
+      saxParser.parse(new FileInputStream("/Users/e115731/workspace/JungleXmlReader/_xml/" + xml + ".xml"),
+          updateXmlHandler);
+    }
+  }
+}