From cf71ff01a7cc17196f920f903d2ed9aeb074c0ce Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Thu, 25 Jul 2019 10:40:32 +0200 Subject: [PATCH] CMSIS-DSP: Add primary keys to generated benchmark tables in the database. --- .gitignore | 5 ++++- Testing/addToDB.py | 15 +++++++++++++-- Testing/bench.db | Bin 57344 -> 81920 bytes 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8a3449da..81c7c8ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -DSP_Lib_TestSuite/build/ \ No newline at end of file +DSP_Lib_TestSuite/build/ +PythonWrapper/build/ +PythonWrapper/cmsisdsp.cp36-win_amd64.pyd +PythonWrapper/rec_2.dat \ No newline at end of file diff --git a/Testing/addToDB.py b/Testing/addToDB.py index 0ef54b43..ea4c9715 100755 --- a/Testing/addToDB.py +++ b/Testing/addToDB.py @@ -77,7 +77,9 @@ def createTableIfMissing(conn,elem,tableName,full): cols = list(full.columns) params = list(joinit(elem.params.full,",")) common = diff(cols + ["TYPE"] , ['OLDID'] + params) - start = "" + + sql += "%sid INTEGER PRIMARY KEY" % (tableName) + start = "," for field in params: sql += " %s\n %s INTEGER" % (start,field) @@ -148,9 +150,18 @@ def addRows(conn,elem,tableName,full): cols = list(full.columns) params = list(joinit(elem.params.full,",")) common = diff(["TYPE"] + cols , ['OLDID'] + params) + colNameList = [] + for c in params + keep: + if c in MKKEYFIELD: + colNameList.append(MKKEYFIELDID[c]) + else: + colNameList.append(c) + colNames = "".join(joinit(colNameList,",")) + #print(colNameList) + #print(colNames) #print(full) for index, row in full.iterrows(): - sql = "INSERT INTO %s VALUES(" % tableName + sql = "INSERT INTO %s(%s) VALUES(" % (tableName,colNames) keys = {} # Get data from columns diff --git a/Testing/bench.db b/Testing/bench.db index 2654de0ec136d66b31280a003712c4d63cbf24cd..25570985b60f136c4d16a24b9e0c4640ed4e969b 100755 GIT binary patch literal 81920 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 M!0?|z_#HmI0Qom*cmMzZ