Merge pull request #541 from Lexpedite/improved_events

Improved events

.gitignore

@@ -4,4 +4,5 @@
 *.pyc
 transcript
 /blawxbot/.rasa/
-/blawxbot/models/
+/blawxbot/models/
+blawx/util/test.pl

CHANGELOG.md

@@ -7,6 +7,15 @@ As of v0.2-alpha, this project is attempting to adhere to [Semantic Versioning](
 While alpha, however, any version may include breaking changes that may not be specifically noted as such,
 and breaking changes will not necessarily result in changes to the main version number.
 
+## [v1.6.14-alpha](https://github.com/Lexpedite/blawx/releases/tag/v1.6.14-alpha) 2023-05-12
+
+### Added
+* A GCWeb-themed version of Scenario Editor
+
+### Fixed
+* Event reasoning was finding spurious evidence of non-interruption.
+
+
 ## [v1.6.13-alpha](https://github.com/Lexpedite/blawx/releases/tag/v1.6.13-alpha) 2023-05-09
 
 ### Fixes

blawx/aggregates.py

@@ -37,4 +37,22 @@
 min_blawx_list([First|Rest],RestMin) :-
     min_blawx_list(Rest,RestMin),
     First #> RestMin.
+
+blawx_list_not_between([Head|Tail],Start,End) :-
+    blawx_not_between(Head,Start,End),
+    blawx_list_not_between(Tail,Start,End).
+blawx_list_not_between([],_,_).
+blawx_not_between(X,Y,Z) :- X =< Y.
+blawx_not_between(X,Y,Z) :- X >= Z.
+
+blawx_list_not_before([Head|Tail],End) :-
+    Head >= End,
+    blawx_list_not_before(Tail,End).
+blawx_list_not_before([],_).
+
+blawx_list_not_after([Head|Tail],Start) :-
+    Head =< Start,
+    blawx_list_not_after(Tail,Start).
+blawx_list_not_after([],_).
+
 """

blawx/settings.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 
 # For adding a version identifier
-BLAWX_VERSION = "v1.6.13-alpha"
+BLAWX_VERSION = "v1.6.14-alpha"
 
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.

blawx/templates/blawx/scenario_editor.html

@@ -210,7 +210,8 @@ <h6>Response</h6>
         'is',
         'date_add',
         'date_compare',
-        'duration_compare'];
+        'duration_compare',
+        'blawx_list_not_between'];
 
         function getNodeName(node,answer,explanation) {
             var node_name = "";
@@ -550,6 +551,10 @@ <h6>Response</h6>
                 return "ultimately, " + answerNLG(model.args[0],human);
             } else if (model.functor == "blawx_during") {
                 return "from " + displayValue(model.args[0],human) + " to " + displayValue(model.args[2],human) + " " + answerNLG(model.args[1],human);
+            } else if (model.functor == "blawx_not_interrupted") {
+                return "between " + displayValue(model.args[0],human) + " and " + displayValue(model.args[2],human) + " it remained the case that " + answerNLG(model.args[1],human);
+            } else if (model.functor == "blawx_list_not_between") {
+                return displayValue(model.args[0],human) + " doesn't include elements between " + displayValue(model.args[1],human) + " and " + displayValue(model.args[2],human);
             } else if (model.functor == "abduced" && model.args[0].functor != "-") {
                 return "it is hypothesized that " + answerNLG(model.args[0],human);
             } else if (model.functor == "abduced" && model.args[0].functor == "-") {