Merge pull request #90 from doug-martin/master

v0.2.1
noolsjs · Nov 8, 2013 · 6625afd · 6625afd
2 parents 00332c0 + 86eea5e
commit 6625afd
Show file tree

Hide file tree

Showing 44 changed files with 10,705 additions and 422 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -30,7 +30,7 @@ module.exports = function (grunt) {
                     '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
                     '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;' +
                     ' Licensed <%= pkg.license %> */\n',
-                report: 'gzip'
+                report: 'min'
             },
             min: {
                 files: {

diff --git a/benchmark/waltzDb/benchmark.js b/benchmark/waltzDb/benchmark.js
@@ -2,8 +2,9 @@
 var data = require("./data"),
     nools = require("../../index");
 
-var flow = nools.compile(__dirname + "/waltzDb.nools");
-var items = data.load(flow).waltzdb8;
+var flow = nools.compile(__dirname + "/waltzDb.nools")
+    .conflictResolution(["salience", "factRecency", "activationRecency"]);
+var items = data.load(flow).waltzdb4;
 var session = flow.getSession.apply(flow, items);
 session.assert(new (flow.getDefined("stage"))({value: "DUPLICATE"}));
 var start = new Date();

diff --git a/benchmark/waltzDb/waltzDb.nools b/benchmark/waltzDb/waltzDb.nools
@@ -78,8 +78,7 @@ function getAngle(p1, p2){
   			return PI/2;
   		else if (deltaY < 0)
   			return -PI/2;
-  	}
-  	else if (deltaY == 0) {
+  	}else if (deltaY == 0) {
   		if (deltaX > 0)
   			return 0.0;
   		else if (deltaX < 0)
@@ -721,9 +720,9 @@ rule start_visit_2_junction {
         junction : Junction junction.type == '2j' && junction.visited == 'no' {basePoint : basePoint, p1 : p1, p2 : p2};
 	}
 	then {
+        modify(junction, function(){ this.visited = "now";});
         modify(stage, function(){ this.value = 'VISITING_2J';});
         console.log( "VISITING_2J" );
-        modify(junction, function(){ this.visited = "now";});
 	}
 }
 

diff --git a/docs/History.html b/docs/History.html
@@ -178,6 +178,21 @@
 
 
 
+<h1>0.2.1</h1>
+<ul>
+<li>Added support for js expression in the <code>from</code> node addressing issue <a href="https://github.com/C2FO/nools/issues/86">#86</a></li>
+<li>Enhanced <code>JoinReferenceNode</code> performance in the default assert case where there are no <code>references</code> to left or right context.</li>
+<li>Added ability to use <code>or</code> and <code>not</code> in tandem to check for the non-existence of multiple facts. <a href="https://github.com/C2FO/nools/issues/85">#85</a></li>
+<li>Fixed issue with <code>from</code> node where an undefined property would be tested. <a href="https://github.com/C2FO/nools/issues/89">#89</a></li>
+<li>You can now define a custom resolution strategy.</li>
+<li>Compiling nools files now supports the from modifier.</li>
+<li>Documentation updates<ul>
+<li>Updates about from node support with js values.</li>
+<li>New documentation about using <code>or</code> and <code>not</code> constratints together.</li>
+<li>Updated <code>or</code> documentation to include a three constraint example.</li>
+</ul>
+</li>
+</ul>
 <h1>0.2.0 / 2013-10-14</h1>
 <ul>
 <li>Nools now supports true modify!!!<ul>