Merge pull request #55 from markplagge/Dumpi-Tomacs-Lua53

Dumpi tomacs lua53

.gitignore

@@ -56,7 +56,7 @@ cmake-build-debug
 cmake-build-release
 .idea/
 
-src/lib/
+
 
 
 scripts/__pycache__/
@@ -65,3 +65,27 @@ scripts/ol_api/t1\.csv
 scripts/tn_api/__init__.pyc
 
 *.pyc
+
+scripts/\.DS_Store
+
+\.DS_Store
+
+build/
+
+*.nfg1
+scripts/cf100_spike.csv
+scripts/ex1_spike.csv
+nemo_spike.csv
+*.sqlite
+*.json
+*.sfcp
+*.tnbm
+*.bin
+*.mat
+*.conf
+
+scripts/dumpi_virt-0_rnk0\.txt
+
+scripts/results\.log
+
+scripts/testtbl1

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_C_STANDARD 99)
-ADD_COMPILE_OPTIONS(-std=gnu99)
+#ADD_COMPILE_OPTIONS(-std=gnu99)
 #set(CMAKE_C_FLAGS "${CMAKE_C_CFLAGS} -std=gnu99")
 project(SuperNeMo)
 enable_testing()
@@ -10,15 +10,19 @@ include(ExternalProject)
 set (RD "${CMAKE_CURRENT_SOURCE_DIR}/ROSS/")
 set (ND "${CMAKE_CURRENT_SOURCE_DIR}/src/")
 set (LuaD "${CMAKE_CURRENT_SOURCE_DIR}/lua")
-
+set (SQLD "${CMAKE_CURRENT_SOURCE_DIR}/sqlite/")
+set (simcld "${CMAKE_CURRENT_SOURCE_DIR}/src/lib/simclist")
 
 #cmake_policy(SET CMP0012 OLD)
 # LUA Options
 #SET(USE_LUA_JIT FALSE BOOL)
 option(USE_LUA_JIT "Use JIT lua project for scripting" OFF)
-#SET(USE_LUA_JIT TRUE)
+#sSET(USE_LUA_JIT TRUE)
 ADD_SUBDIRECTORY(${RD})
 
+ADD_SUBDIRECTORY(${SQLD})
+ADD_SUBDIRECTORY(${simcld})
+
 if(USE_LUA_JIT)
     message(STATUS "LUA JIT PROJECT" )
 

scripts/df.py

@@ -0,0 +1,24 @@
+#test values:
+tests = [1,2,3,4,5,6,7,8,9,10]
+testadds= [1,2,3,4,5,6,7,8,9,0]
+
+arr_setup = 'uint32_t *'
+arr_val = ' = {'
+outArrs = []
+for t,a in zip(tests, testadds):
+    tb = bin(t)[2:]
+    ab = bin(a)[2:]
+    txto = arr_setup + "a" + arr_val
+    txtb = arr_setup + "b" + arr_val
+    for ac,bc in zip(tb,ab):
+        txto = f"{txto}{ac},"
+        txtb = f"{txtb}{bc},"
+
+    txto = txto + "};"
+    txtb = txtb + "};"
+
+    outArrs.append(txto)
+    outArrs.append(txtb)
+
+for i in outArrs:
+    print(i)