Skip to content

Commit ea23a6f

Browse files
authored
bump nptyping (#722)
* update nptyping Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>
1 parent 41c304e commit ea23a6f

13 files changed

Lines changed: 85 additions & 84 deletions

File tree

python_package/brainflow/board_shim.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pkg_resources
1111
from brainflow.exit_codes import BrainFlowExitCodes, BrainFlowError
1212
from brainflow.utils import LogLevels
13-
from nptyping import NDArray, Float64
13+
from nptyping import NDArray, Float64, Shape
1414
from numpy.ctypeslib import ndpointer
1515

1616

@@ -1266,15 +1266,15 @@ def release_session(self) -> None:
12661266
if res != BrainFlowExitCodes.STATUS_OK.value:
12671267
raise BrainFlowError('unable to release streaming session', res)
12681268

1269-
def get_current_board_data(self, num_samples: int, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Float64]:
1269+
def get_current_board_data(self, num_samples: int, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Shape["*, *"], Float64]:
12701270
"""Get specified amount of data or less if there is not enough data, doesnt remove data from ringbuffer
12711271
12721272
:param num_samples: max number of samples
12731273
:type num_samples: int
12741274
:param preset: preset
12751275
:type preset: int
12761276
:return: latest data from a board
1277-
:rtype: NDArray[Float64]
1277+
:rtype: NDArray[Shape["*, *"], Float64]
12781278
"""
12791279

12801280
package_length = BoardShim.get_num_rows(self._master_board_id, preset)
@@ -1345,15 +1345,15 @@ def is_prepared(self) -> bool:
13451345
raise BrainFlowError('unable to check session status', res)
13461346
return bool(prepared[0])
13471347

1348-
def get_board_data(self, num_samples=None, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Float64]:
1348+
def get_board_data(self, num_samples=None, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Shape["*, *"], Float64]:
13491349
"""Get board data and remove data from ringbuffer
13501350
13511351
:param num_samples: number of packages to get
13521352
:type num_samples: int
13531353
:param preset: preset
13541354
:type preset: int
13551355
:return: all data from a board if num_samples is None, num_samples packages or less if not None
1356-
:rtype: NDArray[Float64]
1356+
:rtype: NDArray[Shape["*, *"], Float64]
13571357
"""
13581358

13591359
data_size = self.get_board_data_count(preset)

python_package/brainflow/data_filter.py

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

python_package/brainflow/ml_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import pkg_resources
1111
from brainflow.board_shim import BrainFlowError, LogLevels
1212
from brainflow.exit_codes import BrainFlowExitCodes
13-
from nptyping import NDArray
13+
from nptyping import NDArray, Float64, Shape
1414
from numpy.ctypeslib import ndpointer
1515

1616

@@ -262,11 +262,11 @@ def release(self) -> None:
262262
if res != BrainFlowExitCodes.STATUS_OK.value:
263263
raise BrainFlowError('unable to release classifier', res)
264264

265-
def predict(self, data: NDArray) -> List:
265+
def predict(self, data: NDArray[Shape["*"], Float64]) -> List:
266266
"""calculate metric from data
267267
268268
:param data: input array
269-
:type data: NDArray
269+
:type data: NDArray[Shape["*"], Float64]
270270
:return: metric value
271271
:rtype: List
272272
"""

python_package/examples/tests/board_descr.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import brainflow
21
from brainflow.board_shim import BoardShim
32

43
BoardShim.enable_dev_board_logger()

python_package/examples/tests/brainflow_get_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import argparse
22
import time
33

4-
from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds, BrainFlowPresets
4+
from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds
55

66

77
def main():

python_package/examples/tests/csp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def main():
1010

1111
data = np.array([[[6, 3, 1, 5], [3, 0, 5, 1]], [[1, 5, 6, 2], [5, 1, 2, 2]]]).astype('float64')
1212

13-
filters, eigvals = DataFilter.get_csp(data, labels);
13+
filters, eigvals = DataFilter.get_csp(data, labels)
1414

1515
true_filters = np.array([[-0.313406, 0.0792153], [-0.280803, -0.480046]])
1616

python_package/examples/tests/data_collector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import argparse
22
import time
33

4-
from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds, BrainFlowPresets
4+
from brainflow.board_shim import BoardShim, BrainFlowInputParams
55

66

77
def main():

python_package/examples/tests/ganglion_resist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def main():
1111
board.prepare_session()
1212
# expected result: 5 seconds of resistance data(unknown sampling rate) after that 5 seconds of exg data
1313
board.config_board('z')
14-
board.start_stream(45000, f'file://raw_data.csv:w')
14+
board.start_stream(45000, 'file://raw_data.csv:w')
1515
time.sleep(5)
1616
board.config_board('Z')
1717
time.sleep(5)

python_package/examples/tests/ganglion_wifi_resist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ def main():
1313
BoardShim.enable_dev_board_logger()
1414

1515
params = BrainFlowInputParams()
16-
params.ip_address = args.ip_address;
17-
params.ip_port = args.ip_port;
16+
params.ip_address = args.ip_address
17+
params.ip_port = args.ip_port
1818
board = BoardShim(BoardIds.GANGLION_WIFI_BOARD.value, params)
1919
board.prepare_session()
2020

python_package/examples/tests/peaks_detection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import matplotlib.pyplot as plt
99

1010
from brainflow.board_shim import BoardShim, BrainFlowInputParams, LogLevels, BoardIds
11-
from brainflow.data_filter import DataFilter, ThresholdTypes, AggOperations, NoiseTypes, WaveletTypes, DetrendOperations
11+
from brainflow.data_filter import DataFilter, NoiseTypes, WaveletTypes, DetrendOperations
1212

1313

1414
def main():

0 commit comments

Comments
 (0)