Fixed merge conflict in README.md

keiffster · Nov 8, 2017 · fb05118 · fb05118
2 parents ff6ff9f + ce53c43
commit fb05118
Showing 185 changed files with 13,154 additions and 7,382 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,4 +104,5 @@ bots/y-bot/output/
 /bots/alice2/output/
 /bots/professor/output/
 /scratch/
-temp/
+temp/
+conversations/
diff --git a/README.md b/README.md
@@ -1,42 +1,19 @@
 # Readme info:
 
-Version: 1.0.1 <br/>
+Version: 1.2.0 <br/>
 Authors: Keith Sterling <br/>
-Date: 13th October 2017 <br/>
-NEWS: Version 1.1.0 Released
-
-# WHATS NEW IN 1.1
-
-1) CSV Output.
-
-By specifying the following config options, Program-Y can now output errors, duplicates and conversation in csv format
-
-    files:
-        aiml:
-           errors:
-              file: /tmp/y-bot_errors.csv
-              format: csv
-              encoding: utf-8
-              delete_on_start: true
-           duplicates:
-              file: /tmp/y-bot_duplicates.csv
-              format: csv
-              encoding: utf-8
-              delete_on_start: true
-           conversation:
-              file: /tmp/y-bot-conversation.csv
-              format: csv
-              delete_on_start: true
-
-2) Default Variables
-
-New config option properties which will load a set of default property values into each new conversation as it is initiated.
-New conversations are defined by a unique clientid
-
-    files:
-        aiml:
-            properties: $BOT_ROOT/config/properties.txt
-
+Date: 8th November 2017 <br/>
+
+### Whats New in 1.2
+* RDF Engine completely rewritten to be fully compatible with Alice grammar
+* Refactored Y-Bot triples.txt into more understandable and workable files based on category
+* New RDF Formatter  tool in utils 
+* Updated use of file handling to open all but neccassary files in readonly mode
+* Conversations now persistent between bot restarts
+
+### Whats New in 1.1
+* CSV Output.
+* Default Variables
 
 
 # Introduction

diff --git a/bots/alice2/aiml/admin/properties.aiml b/bots/alice2/aiml/admin/properties.aiml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml>
+
+    <category>
+        <pattern>YADMIN BOT PROPERTIES</pattern>
+        <template>
+            <extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
+                BOT
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>YADMIN GET BOT PROPERTY *</pattern>
+        <template>
+            <extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
+                GET BOT <star/>
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>YADMIN USER PROPERTIES</pattern>
+        <template>
+            <extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
+                USER
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>YADMIN GET USER PROPERTY *</pattern>
+        <template>
+            <extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
+                GET USER <star/>
+            </extension>
+        </template>
+    </category>
+
+</aiml>
diff --git a/bots/alice2/aiml/admin/rdf.aiml b/bots/alice2/aiml/admin/rdf.aiml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml>
+
+    <category>
+        <pattern>RDF LIST SUBJECTS</pattern>
+        <template>
+            <extension path="programy.extensions.admin.rdf.RDFAdminExtension">
+                SUBJECTS
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>RDF LIST PREDICATES SUBJECT *</pattern>
+        <template>
+            <extension path="programy.extensions.admin.rdf.RDFAdminExtension">
+                PREDICATES <star/>
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>RDF LIST OBJECTS SUBJECT * PREDICATE *</pattern>
+        <template>
+            <extension path="programy.extensions.admin.rdf.RDFAdminExtension">
+                OBJECT <star index="1" /> <star index="2" />
+            </extension>
+        </template>
+    </category>
+
+</aiml>
diff --git a/bots/alice2/aiml/admin/transcript.aiml b/bots/alice2/aiml/admin/transcript.aiml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml>
+
+    <category>
+        <pattern>TRANSCRIPT</pattern>
+        <template>
+            <extension path="programy.extensions.admin.transcript.TranscriptAdminExtension">
+            </extension>
+        </template>
+    </category>
+
+    <category>
+        <pattern>TRANSCRIPT # PROPERTIES</pattern>
+        <template>
+            <extension path="programy.extensions.admin.transcript.TranscriptAdminExtension">
+                PROPERTIES
+            </extension>
+        </template>
+    </category>
+
+</aiml>
diff --git a/bots/alice2/aiml/triple.aiml b/bots/alice2/aiml/triple.aiml
@@ -16,6 +16,16 @@
     <!--  -->
     <!-- For more information see http://www.alicebot.org -->
     <!--  -->
+    <category>
+		<pattern>TRIPLE TEST * *</pattern>
+		<template>
+			<select>
+				<vars>?x</vars>
+				<q><subj><star index="1"/></subj><pred><star index="2"/></pred><obj>?x</obj></q>
+			</select>
+		</template>
+	</category>
+
     <category>
         <pattern>GENSYM</pattern>
         <template>
@@ -33,6 +43,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>I HAVE A <set>color</set> *
         </pattern>
@@ -95,6 +106,7 @@
             is a nice color of<star index="2"/>.
         </template>
     </category>
+
     <category>
         <pattern>WHAT DO I HAVE ^</pattern>
         <template>
@@ -150,6 +162,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>WHAT COLOR IS MY *</pattern>
         <template>
@@ -195,6 +208,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>WHAT <set>color</set> ^ DO I HAVE
         </pattern>
@@ -240,6 +254,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>
             <set>entity</set>
@@ -249,6 +264,7 @@
             is an enity.
         </template>
     </category>
+
     <category>
         <pattern>SIZE TABLE</pattern>
         <template>
@@ -311,16 +327,19 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>COMMAFY NIL</pattern>
         <template>
             <template/>
         </template>
     </category>
+
     <category>
         <pattern>COMMAFY *</pattern>
         <template>,</template>
     </category>
+
     <category>
         <pattern>UNIQ TEST</pattern>
         <template>
@@ -331,6 +350,7 @@
             </uniq>
         </template>
     </category>
+
     <category>
         <pattern>UNIQ TEST 2</pattern>
         <template>
@@ -365,6 +385,7 @@
             </uniq>
         </template>
     </category>
+
     <category>
         <pattern>UNIQ TEST 3</pattern>
         <template>
@@ -383,6 +404,7 @@
             </uniq>
         </template>
     </category>
+
     <category>
         <pattern>WHAT IS THE PURPOSE OF *</pattern>
         <template>
@@ -408,6 +430,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>ADDTRIPLE TEST</pattern>
         <template>Adding triples:
@@ -437,6 +460,7 @@
             </addtriple>
         </template>
     </category>
+
     <category>
         <pattern>DELETETRIPLE TEST</pattern>
         <template>Adding triples:
@@ -495,6 +519,7 @@
             </select>
         </template>
     </category>
+
     <category>
         <pattern>WHICH IS LARGER ^ <set>entity</set> OR ^
             <set>entity</set>
@@ -521,6 +546,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>WHICH IS FASTER <set>entity</set> OR
             <set>entity</set>
@@ -547,6 +573,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>ALL ISA</pattern>
         <template>
@@ -613,6 +640,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST</pattern>
         <template>
@@ -656,6 +684,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST NOTQ</pattern>
         <template>
@@ -671,6 +700,7 @@
             </set>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST NOT</pattern>
         <template>
@@ -714,6 +744,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST NOT 2</pattern>
         <template>
@@ -767,6 +798,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST NOT 3</pattern>
         <template>
@@ -820,6 +852,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST 3</pattern>
         <template>
@@ -884,6 +917,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>SELECT TEST 2</pattern>
         <template>
@@ -932,6 +966,7 @@
             </condition>
         </template>
     </category>
+
     <category>
         <pattern>* IS <set>erdown</set> THAN *
         </pattern>
@@ -962,6 +997,7 @@
             </srai>
         </template>
     </category>
+
     <category>
         <pattern>
             <set>name</set>