Merge branch 'master' of https://github.com/OleBialas/mTRFpy into Ole…

…Bialas-master

.github/workflows/python-package.yml

@@ -0,0 +1,40 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        pip install -e .[testing]
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

example/RunExample.py

@@ -12,7 +12,7 @@
 '''
 
 from mTRFpy import Tools
-from mTRFpy.Model import CTRF
+from mTRFpy.Model import TRF
 from mTRFpy.Tools import cmp2NArray
 
 oStage = Tools.StageControl([1,2])
@@ -24,10 +24,10 @@
     stim = speechAndRespData['stim']
     resp = speechAndRespData['resp']
     fs = speechAndRespData['fs'][0,0]
-    oTRFEncoder = CTRF()
+    oTRFEncoder = TRF()
     oTRFEncoder.train(stim,resp,1,fs,-100,200,100)
-    assert cmp2NArray(oTRFEncoder.w,encoderResult['modelEncoder']['w'][0,0],10)
-    assert cmp2NArray(oTRFEncoder.b,encoderResult['modelEncoder']['b'][0,0],12)
+    assert cmp2NArray(oTRFEncoder.weights,encoderResult['modelEncoder']['w'][0,0],10)
+    assert cmp2NArray(oTRFEncoder.bias,encoderResult['modelEncoder']['b'][0,0],12)
     predE,rE,errE = oTRFEncoder.predict(stim,resp)
     assert cmp2NArray(predE[0], encoderResult['predResp'],10)
     assert cmp2NArray(rE, encoderResult['predRespStats']['r'][0,0],11)
@@ -40,10 +40,10 @@
     stim = speechAndRespData['stim']
     resp = speechAndRespData['resp']
     fs = speechAndRespData['fs'][0,0]
-    oTRFDecoder = CTRF()
+    oTRFDecoder = TRF()
     oTRFDecoder.train(stim,resp,-1,fs,-100,200,100)
-    assert cmp2NArray(oTRFDecoder.w,decoderResult['modelDecoder']['w'][0,0],8)
-    assert cmp2NArray(oTRFDecoder.b,decoderResult['modelDecoder']['b'][0,0],11)
+    assert cmp2NArray(oTRFDecoder.weights,decoderResult['modelDecoder']['w'][0,0],8)
+    assert cmp2NArray(oTRFDecoder.bias,decoderResult['modelDecoder']['b'][0,0],11)
     predD,rD,errD = oTRFDecoder.predict(stim,resp)
     assert cmp2NArray(predD[0], decoderResult['predStim'],8)
     assert cmp2NArray(rD, decoderResult['predStimStats']['r'][0,0],12)