Mercurial > hg > Applications > JavaLite
changeset 96:116a6afd11aa working
*** empty log message ***
author | kono |
---|---|
date | Fri, 18 Jan 2008 23:41:38 +0900 |
parents | d10040e1c096 |
children | 07a36431aa14 |
files | build.xml src/lite/ITLNodeParser.java src/parser/LogicNodeParser.java src/sbdd/SBDDTest.java |
diffstat | 4 files changed, 20 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/build.xml Fri Jan 18 23:05:49 2008 +0900 +++ b/build.xml Fri Jan 18 23:41:38 2008 +0900 @@ -23,7 +23,7 @@ <!-- test --> <target name="test" depends="build"> - <java classname="${main}" fork="yes" > + <java classname="${test}" fork="yes" > <jvmarg value="-Dfile.encoding=UTF8"/> <classpath> <pathelement path="src"/>
--- a/src/lite/ITLNodeParser.java Fri Jan 18 23:05:49 2008 +0900 +++ b/src/lite/ITLNodeParser.java Fri Jan 18 23:41:38 2008 +0900 @@ -116,6 +116,7 @@ define("share0(L)","true",50, new Command<Node>() { @SuppressWarnings("unchecked") public Node exec(Node predicate, Node value, LinkedList<Node> args) { + Node allElse = (Node)SBDDFactory.trueSolver; Node allFalse = (Node)SBDDFactory.trueSolver; value= (Node)SBDDFactory.falseSolver; LinkedList<ITLSolver> list = args.get(0).arguments(); @@ -126,11 +127,14 @@ if (list.isEmpty()) return value; for(ITLSolver n: list) { Node n1 = (Node)n; - value = logicNodeFactory.bddNode(n1, allFalse, value); - allFalse = logicNodeFactory.bddNode(n1, - (Node)SBDDFactory.falseSolver,allFalse); + value = logicNodeFactory.bddNode(n1, allElse, value); + allElse = logicNodeFactory.bddNode(n1, + (Node)SBDDFactory.falseSolver,allElse); + allFalse = logicNodeFactory.andNode( + logicNodeFactory.notNode(n1), allFalse); } - return value; + //return value; + return logicNodeFactory.orNode(value,allFalse); } });
--- a/src/parser/LogicNodeParser.java Fri Jan 18 23:05:49 2008 +0900 +++ b/src/parser/LogicNodeParser.java Fri Jan 18 23:41:38 2008 +0900 @@ -300,6 +300,7 @@ System.out.write(buf,0,len); } } catch (IOException e) { + error("can't find "+file); } }
--- a/src/sbdd/SBDDTest.java Fri Jan 18 23:05:49 2008 +0900 +++ b/src/sbdd/SBDDTest.java Fri Jan 18 23:41:38 2008 +0900 @@ -20,10 +20,10 @@ SBDDTest test = new SBDDTest(); - //test.satTest(); - //test.verifyTest(); - test.mainLoop(); - //test.bddTest(); + test.satTest(); + test.bddTest(); + test.verifyTest(); + //test.mainLoop(); } @@ -94,14 +94,17 @@ //sat.showVerify("a?(x;(b?x:c)):false"); // sat.showVerify("+(a & b)"); - //System.out.println(sat.state); - sat.p.parse("include('data/example')."); //System.out.println(p.parseCommand.sat.state); sat.showVerify("length(2),[]p"); + sat.p.parse("do(share0([a,b,c,d,e]))"); + sat.p.parse("include('src/data/example')."); sat.p.parse("do((length(10),fin(p)))"); sat.p.parse("exe"); + sat.p.parse("verbose(false)"); sat.p.parse("do(10)"); - sat.p.parse("diag"); + sat.p.parse("show"); + sat.p.parse("verbose"); + //System.out.println(sat.state); }