Mercurial > hg > Applications > JavaLite

changeset 74:147864a924cd remove-logicNode

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author kono
date Thu, 17 Jan 2008 01:49:50 +0900
parents 034c573af8ea
children 75c0ecc1f09a
files build.xml src/lite/ChopSolver.java src/lite/ExistsSolver.java src/lite/FalseSolver.java src/lite/ITLCommander.java src/lite/ITLNodeFactory.java src/lite/ITLNodeFactoryInterface.java src/lite/ITLNodeParser.java src/lite/ITLNodeScanner.java src/lite/ITLNodeScannerTest.java src/lite/ITLSolver.java src/lite/MacroSolver.java src/lite/NextSolver.java src/lite/ProjectionSolver.java src/lite/TrueSolver.java src/sbdd/BDDSatisfier.java src/sbdd/SBDDFactory.java
diffstat 17 files changed, 44 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/build.xml	Wed Jan 16 14:34:11 2008 +0900
+++ b/build.xml	Thu Jan 17 01:49:50 2008 +0900
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="example" default="run" basedir=".">
+<project name="JavaLite" default="run" basedir=".">
 
 
   <property name="output" value="."/>
-  <property name="main" value="logicNode/LogicNodeTest"/>
+  <property name="main" value="sbdd/SBDDTest"/>
 
   <target name="build">
     <javac encoding="UTF-8" srcdir="."/>
--- a/src/lite/ChopSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ChopSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
 
--- a/src/lite/ExistsSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ExistsSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
--- a/src/lite/FalseSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/FalseSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
 
--- a/src/lite/ITLCommander.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLCommander.java	Thu Jan 17 01:49:50 2008 +0900
@@ -3,9 +3,10 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 
+import parser.Command;
+
 import sbdd.BDDDiagnosis;
 import sbdd.BDDSatisfier;
-import logicNode.parser.Command;
 
 public class ITLCommander<Node extends ITLSolver> implements Command<Node> {
 
--- a/src/lite/ITLNodeFactory.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLNodeFactory.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,11 +1,12 @@
 package lite;
 
 import java.util.LinkedList;
+
+import parser.Command;
+import parser.MacroNodeParserInterface;
 import sbdd.SBDDFactoryInterface;
 import sbdd.SBDDSet;
 
-import logicNode.parser.Command;
-import logicNode.parser.MacroNodeParserInterface;
 
 
 public class ITLNodeFactory implements	ITLNodeFactoryInterface<ITLSolver>,
--- a/src/lite/ITLNodeFactoryInterface.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLNodeFactoryInterface.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,10 +1,9 @@
 package lite;
 
-
-import logicNode.MacroNodeFactoryInterface;
+import parser.LogicNodeFactoryInterface;
 
 public interface ITLNodeFactoryInterface<T> 
-      extends MacroNodeFactoryInterface<T> {
+      extends LogicNodeFactoryInterface<T> {
 
 	public T chopNode(T former, T later) ;
 	public T emptyNode();
--- a/src/lite/ITLNodeParser.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLNodeParser.java	Thu Jan 17 01:49:50 2008 +0900
@@ -2,14 +2,15 @@
 
 import java.util.LinkedList;
 
+import parser.Command;
+import parser.Dictionary;
+import parser.LogicNodeScope;
+import parser.MacroNodeParser;
+import parser.Token;
+import parser.TokenID;
+
 import sbdd.SBDDFactory;
 
-import logicNode.parser.Command;
-import logicNode.parser.Dictionary;
-import logicNode.parser.LogicNodeScope;
-import logicNode.parser.MacroNodeParser;
-import logicNode.parser.Token;
-import logicNode.parser.TokenID;
 
 public class ITLNodeParser<Node extends ITLSolver> extends MacroNodeParser<Node> {
 
@@ -106,7 +107,7 @@
 			// only one of the is true (should allow all false case?)
 			define("share(L)","[](share0(L))");
 			define("share0(L)","true",50, new Command<Node>() {
-				@SuppressWarnings({ "unchecked", "unchecked" })
+				@SuppressWarnings("unchecked")
 				public Node exec(Node predicate, Node value, LinkedList<Node> args) {
 					Node allFalse = (Node)SBDDFactory.trueSolver;
 					value= (Node)SBDDFactory.falseSolver;
--- a/src/lite/ITLNodeScanner.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLNodeScanner.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,11 +1,11 @@
 package lite;
 
 
-import logicNode.LogicNode;
-import logicNode.parser.Dictionary;
-import logicNode.parser.LogicNodeScanner;
+import parser.Dictionary;
+import parser.LogicNodeScanner;
+import verifier.LogicSolver;
 
-public class ITLNodeScanner<Node extends LogicNode> extends LogicNodeScanner<Node> {
+public class ITLNodeScanner<Node extends LogicSolver> extends LogicNodeScanner<Node> {
 
 
 	public ITLNodeScanner(Dictionary<Node> dict) {
--- a/src/lite/ITLNodeScannerTest.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLNodeScannerTest.java	Thu Jan 17 01:49:50 2008 +0900
@@ -3,7 +3,8 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 
-import logicNode.parser.*;
+import parser.*;
+
 
 public class ITLNodeScannerTest extends LogicNodeScannerTest {
 
--- a/src/lite/ITLSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ITLSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -2,16 +2,15 @@
 
 import java.util.LinkedList;
 
-import logicNode.LogicNode;
-import logicNode.MacroNodeInterface;
-
 import sbdd.BDDInterface;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
+import verifier.LogicSolver;
 
-public class ITLSolver extends LogicNode
-	implements MacroNodeInterface<ITLSolver>,Next,BDDInterface {
+public class ITLSolver extends LogicSolver 
+	implements Next,BDDInterface {
 	
+	public boolean value;
 	public int hash=-1;
 	
 	public ITLSolver sat(ITLSatisfier sat, Continuation next) throws Backtrack {
@@ -36,11 +35,10 @@
 		return false;
 	}
 	
-	@Override
 	public LinkedList<ITLSolver> arguments() {
 		return null;
 	}
-	@Override
+
 	public ITLSolver predicate() {
 		return null;
 	}
@@ -61,5 +59,9 @@
 		return (BDDSolver) sf.falseNode();
 	}
 
+	public boolean value() {
+		return value;
+	}
+
 	
 }
--- a/src/lite/MacroSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/MacroSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -2,8 +2,9 @@
 
 import java.util.LinkedList;
 
-import logicNode.parser.Command;
-import logicNode.parser.MacroNodeParserInterface;
+import parser.Command;
+import parser.MacroNodeParserInterface;
+
 
 import verifier.Backtrack;
 
--- a/src/lite/NextSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/NextSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
 
--- a/src/lite/ProjectionSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/ProjectionSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
 
--- a/src/lite/TrueSolver.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/lite/TrueSolver.java	Thu Jan 17 01:49:50 2008 +0900
@@ -1,6 +1,6 @@
 package lite;
 
-import logicNode.parser.TokenID;
+import parser.TokenID;
 import sbdd.SBDDFactoryInterface;
 import verifier.Backtrack;
 
--- a/src/sbdd/BDDSatisfier.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/sbdd/BDDSatisfier.java	Thu Jan 17 01:49:50 2008 +0900
@@ -2,6 +2,8 @@
 
 import java.util.LinkedList;
 
+import parser.ExecutorInterface;
+
 import verifier.Backtrack;
 import verifier.ChoicePointList;
 
@@ -15,7 +17,6 @@
 import lite.ITLSolver;
 import lite.Next;
 import lite.VariableSolver;
-import logicNode.parser.ExecutorInterface;
 
 public class BDDSatisfier extends ITLSatisfier implements ExecutorInterface<ITLSolver> {
 
--- a/src/sbdd/SBDDFactory.java	Wed Jan 16 14:34:11 2008 +0900
+++ b/src/sbdd/SBDDFactory.java	Thu Jan 17 01:49:50 2008 +0900
@@ -2,10 +2,10 @@
 
 
 
+import parser.TokenID;
 import lite.BDDSolver;
 import lite.ITLNodeFactory;
 import lite.ITLSolver;
-import logicNode.parser.TokenID;
 
 
 public class SBDDFactory implements SBDDFactoryInterface {