opennars · patham9 · Sep 9, 2022 · Sep 12, 2022 · Sep 27, 2022 · Nov 3, 2022
diff --git a/GUI.html b/GUI.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>OpenNARS for Applications: Shell</title>
+</head>
+<body>
+    <textarea style="width: 100%" rows=10 id="input"></textarea>
+    <button onclick="handleClick()">Send</button>
+    <textarea style="width: 100%" rows=20 id="output"></textarea>
+    <script>
+    var input = document.getElementById('input');
+    var output = document.getElementById('output');
+    function print(text)
+    {
+        output.value += text + "\n";
+        output.scrollTop = output.scrollHeight; // focus on bottom
+    }
+    var Module = {
+      arguments: ['nothing'],
+      'print': function(text) { print(text) },
+      'printErr': function(text) { print(text) },
+    };
+    </script>
+    <script src="NAR.js"></script>
+    <script>
+    function NAR_AddInput(narsese)
+    {
+        charptr = stringToNewUTF8(narsese)
+        Module._Shell_ProcessInput(charptr);
+        Module._free(charptr);
+    }
+    function NAR_INIT()
+    {
+        Module._Shell_NARInit();
+    }
+    initialized = false;
+    function handleClick()
+    {
+        if(!initialized)
+        {
+            initialized = true;
+            NAR_INIT()
+        }
+        var inputs = input.value.split("\n");
+        var i=0;
+        while(i<inputs.length)
+        {
+            console.log(inputs[i]);
+            if(inputs[i] != "")
+            {
+                NAR_AddInput(inputs[i]+"\n");
+            }
+            i++;
+        }
+        input.value = "";
+    }
+    </script>
+</body>
+</html>
diff --git a/Shell.html b/Shell.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>OpenNARS for Applications</title>
+</head>
+<body>
+    <textarea id="output" rows="30" style="width: 100%"></textarea>
+    <script>
+    //the prior textarea element where the final output will show up
+    var element = document.getElementById('output');
+    var writeindex = 0;
+    var readindex = -1;
+    var framearray = [];
+    var frame = ""
+    function outputProcess(text)
+    {
+        if(text.includes("\033[1;1H\033[2J"))
+        {
+            framearray[writeindex++] = frame;
+            frame = "";
+        }
+        text = text.replace("\033[1;1H\033[2J","")
+        const ansiEscape = /\x1B\[\d+(;\d+)*m/g;
+        text = text.replace(ansiEscape, '');
+        console.log(text);
+        frame += text + "\n";
+        element.value += text + "\n";
+        readindex = 0;
+    }
+    //which parameter to pass to ONA
+    function getParams()
+    {
+        if(window.location.search == "")
+        {
+            return [];
+        }
+        return window.location.search.substring(1).split("&");
+    }
+    var Module = {
+      arguments: getParams(),
+      'print': function(text) { outputProcess(text); },
+      'printErr': function(text) { outputProcess(text) },
+    };
+    var interval = setInterval(function(){
+     if(readindex != -1 && readindex < framearray.length){
+        element.value = framearray[readindex++];
+     }
+    }, 50)
+    </script>
+    <script src="NAR.js"></script>
+</body>
+</html>
diff --git a/build.cmd b/build.cmd
@@ -0,0 +1,57 @@
+@echo off
+setlocal enabledelayedexpansion
+
+:: delete NAR and src\RuleTable.c
+del .\NAR.exe
+del .\src\RuleTable.c
+
+:: setup error handling
+set ERRORLEVEL=0
+
+:: get all .c file path
+for /r "src" %%f in (*.c) do (
+    set "Str=!Str! %%f"
+)
+
+:: print all .c file path and notify user the compilation is started
+echo !Str!
+echo Compilation started:
+
+:: setup compiler parameters of gcc
+set BaseFlags=-flto -g -pthread -lpthread -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 !Str! -lm -oNAR
+
+:: mute the output of compiler warnings
+set NoWarn=-Wno-unknown-pragmas -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-variable -Wno-strict-prototypes -Wno-implicit-function-declaration -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+
+:: 1st stage compilation
+gcc %* -DSTAGE=1 -Wall -Wextra -Wformat-security %NoWarn% %BaseFlags%
+
+:: check if compilation was successful
+if %ERRORLEVEL% neq 0 (
+    echo Error during first stage compilation.
+    goto :eof
+)
+
+:: notify user that 1st stage is done, and start generating RuleTable.c
+echo First stage done, generating RuleTable.c now, and finishing compilation.
+
+:: generate RuleTable.c uses 1st stage binary
+call NAR.exe NAL_GenerateRuleTable > src\RuleTable.c
+
+:: try second stage compilation with SSE flag
+gcc %* -mfpmath=sse -msse2 -DSTAGE=2 %NoWarn% %BaseFlags% src\RuleTable.c
+if %ERRORLEVEL% equ 0 (
+    echo Done.
+) else (
+    echo Error with SSE, hence compiling without SSE:
+    :: if error, try compilation without SSE:
+    gcc %* -DSTAGE=2 %NoWarn% %BaseFlags% src\RuleTable.c
+    if %ERRORLEVEL% equ 0 (
+        echo Done.
+    ) else (
+        echo Compilation failed.
+    )
+)
+
+:end
+endlocal
diff --git a/build.sh b/build.sh
@@ -2,13 +2,13 @@
 rm NAR
 rm src/RuleTable.c
 set -e
-Str=`ls src/*.c src/NetworkNAR/*.c | xargs`
+Str=`ls src/*.c | xargs`
 echo $Str
 echo "Compilation started:"
-BaseFlags="-flto -g -pthread -lpthread -D_POSIX_C_SOURCE=199506L -std=c++17 -g3 -O3 $Str -lm -oNAR"
-NoWarn="-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-write-strings -Wno-missing-field-initializers -Wno-narrowing -Wno-strict-prototypes -Wno-c++20-compat -Wno-missing-braces"
-g++ $@ -DSTAGE=1 -Wall -Wextra -Wformat-security $NoWarn $BaseFlags
+BaseFlags="-flto -g -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 $Str -lm -oNAR"
+NoWarn="-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-strict-prototypes"
+gcc $@ -DSTAGE=1 -Wall -Wextra -Wformat-security $NoWarn $BaseFlags
 echo "First stage done, generating RuleTable.c now, and finishing compilation."
 ./NAR NAL_GenerateRuleTable > ./src/RuleTable.c
-g++ $@ -mfpmath=sse -msse2 -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c || (echo "Error with SSE, hence compiling without SSE:" && g++ $@ -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c)
+gcc $@ -mfpmath=sse -msse2 -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c || (echo "Error with SSE, hence compiling without SSE:" && gcc $@ -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c)
 echo "Done."
diff --git a/build_ReactOS.bat b/build_ReactOS.bat
@@ -0,0 +1,9 @@
+set Str=src/Cycle.c src/Decision.c src/Event.c src/Globals.c src/HashTable.c src/Inference.c src/InvertedAtomIndex.c src/main.c src/Memory.c src/NAL.c src/NAR.c src/Narsese.c src/PriorityQueue.c src/Shell.c src/Stack.c src/Stamp.c src/Stats.c src/Table.c src/Term.c src/Truth.c src/Usage.c src/Variable.c
+echo %Str%
+echo "Compilation started:"
+set NoWarn=-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-write-strings -Wno-missing-field-initializers -Wno-narrowing
+C:/tcc/tcc -DSTAGE=1 -Wall -Wextra -Wformat-security %NoWarn% %Str% -oNAR.exe
+echo "First stage done, generating RuleTable.c now, and finishing compilation."
+NAR NAL_GenerateRuleTable > src/RuleTable.c
+C:/tcc/tcc -Wl,--stack,4194304 -DSTAGE=2 %Str% src/RuleTable.c -oNAR.exe
+echo "Done."
diff --git a/build_browser.sh b/build_browser.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+rm NAR
+rm src/RuleTable.c
+set -e
+Str=`ls src/*.c | xargs`
+echo $Str
+echo "Compilation started:"
+BaseFlags="-g -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 $Str -lm -oNAR"
+NoWarn="-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-strict-prototypes"
+gcc $@ -DSTAGE=1 -Wall -Wextra -Wformat-security $NoWarn $BaseFlags
+echo "First stage done, generating RuleTable.c now, and finishing compilation."
+./NAR NAL_GenerateRuleTable > ./src/RuleTable.c
+export WASI_SDK_PATH=/home/tc/wasi-sdk
+CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot"
+BaseFlags="-g -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 $Str -lm -oNAR.html"
+emcc $@ -sEXPORTED_FUNCTIONS=_malloc,_main,_Shell_NARInit,_Shell_ProcessInput,_free -sEXPORTED_RUNTIME_METHODS=stringToNewUTF8 -sSTACK_SIZE=10485760 -DSTAGE=2 $NoWarn $BaseFlags -s TOTAL_MEMORY=900mb src/RuleTable.c
+echo "Done."
diff --git a/build_cpp.sh b/build_cpp.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+rm NAR
+rm src/RuleTable.c
+set -e
+Str=`ls src/*.c src/NetworkNAR/*.c | xargs`
+echo $Str
+echo "Compilation started:"
+BaseFlags="-flto -g -pthread -lpthread -D_POSIX_C_SOURCE=199506L -std=c++17 -g3 -O3 $Str -lm -oNAR"
+NoWarn="-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-write-strings -Wno-missing-field-initializers -Wno-narrowing -Wno-strict-prototypes -Wno-c++20-compat -Wno-missing-braces"
+g++ $@ -DSTAGE=1 -Wall -Wextra -Wformat-security $NoWarn $BaseFlags
+echo "First stage done, generating RuleTable.c now, and finishing compilation."
+./NAR NAL_GenerateRuleTable > ./src/RuleTable.c
+g++ $@ -mfpmath=sse -msse2 -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c || (echo "Error with SSE, hence compiling without SSE:" && g++ $@ -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c)
+echo "Done."
diff --git a/build_ipad.sh b/build_ipad.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+rm NAR
+rm src/RuleTable.c
+set -e
+Str=`ls src/*.c | xargs`
+echo $Str
+echo "Compilation started:"
+BaseFlags="-g -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 $Str -lm -oNAR"
+NoWarn="-Wno-unknown-pragmas -Wno-tautological-compare -Wno-dollar-in-identifier-extension -Wno-unused-parameter -Wno-unused-variable -Wno-strict-prototypes"
+gcc $@ -DSTAGE=1 -Wall -Wextra -Wformat-security $NoWarn $BaseFlags
+echo "First stage done, generating RuleTable.c now, and finishing compilation."
+./NAR NAL_GenerateRuleTable > ./src/RuleTable.c
+export WASI_SDK_PATH=/home/tc/wasi-sdk
+CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot"
+BaseFlags="-g -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 $Str -lm -oNAR.wasm"
+/home/tc/wasi-sdk/build/install/opt/bin/clang $@ -DSTAGE=2 $NoWarn $BaseFlags src/RuleTable.c
+echo "Done."
diff --git a/src/Cycle.c b/src/Cycle.c
@@ -805,7 +805,6 @@ void Cycle_RelativeForgetting(long currentTime)
 
 void Cycle_Perform(long currentTime)
 {   
-    Metric_send("NARNode.Cycle", 1);
     //1a. Retrieve BELIEF_EVENT_SELECTIONS events from cyclings events priority queue (which includes both input and derivations)
     Cycle_PopEvents(selectedBeliefs, selectedBeliefsPriority, &beliefsSelectedCnt, &cycling_belief_events, BELIEF_EVENT_SELECTIONS);
     //2a. Process incoming belief events from FIFO, building implications utilizing input sequences

diff --git a/src/Cycle.h b/src/Cycle.h
@@ -41,7 +41,6 @@
 #include "RuleTable.h"
 #include "Variable.h"
 #include "Stats.h"
-#include "./NetworkNAR/Metric.h"
 
 //Methods//
 //-------//

diff --git a/src/Globals.c b/src/Globals.c
@@ -67,3 +67,8 @@ void mysrand(unsigned int seed)
 {
    next = seed;
 }
+
+double mylog2(double n)
+{
+    return log(n) / log(2);
+}
diff --git a/src/Globals.h b/src/Globals.h
@@ -34,7 +34,8 @@
 //////////////
 #include <stdbool.h>
 #include <string.h>
-#include <ctype.h> 
+#include <ctype.h>
+#include <math.h>
 
 //Macros//
 //////////
@@ -73,5 +74,9 @@ void mysrand(unsigned int seed);
 //Stringification macro:
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
+double mylog2(double n);
+#ifndef log2
+#define log2 mylog2
+#endif
 
 #endif
diff --git a/src/NetworkNAR/Metric.c b/src/NetworkNAR/Metric.c