diff --git a/dist/seg1d-0.0.16-py3-none-any.whl b/dist/seg1d-0.0.16-py3-none-any.whl deleted file mode 100644 index fb73d6c..0000000 Binary files a/dist/seg1d-0.0.16-py3-none-any.whl and /dev/null differ diff --git a/dist/seg1d-0.0.16.tar.gz b/dist/seg1d-0.0.16.tar.gz deleted file mode 100644 index 1b315ad..0000000 Binary files a/dist/seg1d-0.0.16.tar.gz and /dev/null differ diff --git a/docs/build/doctest/output.txt b/docs/build/doctest/output.txt index fb4b3fc..a58e0bc 100644 --- a/docs/build/doctest/output.txt +++ b/docs/build/doctest/output.txt @@ -1,12 +1,12 @@ -Results of doctest builder run on 2020-05-04 18:23:07 +Results of doctest builder run on 2020-05-04 19:15:02 ===================================================== -Document: generated/seg1d.optimized_funcs.vcor ----------------------------------------------- +Document: generated/seg1d.Segmenter.clear_reference +--------------------------------------------------- 1 items passed all tests: - 5 tests in default -5 tests in 1 items. -5 passed and 0 failed. + 7 tests in default +7 tests in 1 items. +7 passed and 0 failed. Test passed. Document: generated/seg1d.optimized_funcs.rcor @@ -17,36 +17,20 @@ Document: generated/seg1d.optimized_funcs.rcor 5 passed and 0 failed. Test passed. -Document: api_ecg ------------------ -1 items passed all tests: - 25 tests in default -25 tests in 1 items. -25 passed and 0 failed. -Test passed. - -Document: generated/seg1d.Segmenter ------------------------------------ -1 items passed all tests: - 6 tests in default -6 tests in 1 items. -6 passed and 0 failed. -Test passed. - -Document: generated/seg1d.algorithm.uniques -------------------------------------------- +Document: generated/seg1d.optimized_funcs.vcor +---------------------------------------------- 1 items passed all tests: 5 tests in default 5 tests in 1 items. 5 passed and 0 failed. Test passed. -Document: generated/seg1d.algorithm.combine_corr ------------------------------------------------- +Document: generated/seg1d.Segmenter.add_reference +------------------------------------------------- 1 items passed all tests: - 11 tests in default -11 tests in 1 items. -11 passed and 0 failed. + 10 tests in default +10 tests in 1 items. +10 passed and 0 failed. Test passed. Document: generated/seg1d.Segmenter.t_segments @@ -57,16 +41,8 @@ Document: generated/seg1d.Segmenter.t_segments 11 passed and 0 failed. Test passed. -Document: generated/seg1d.Segmenter.add_reference -------------------------------------------------- -1 items passed all tests: - 10 tests in default -10 tests in 1 items. -10 passed and 0 failed. -Test passed. - -Document: generated/seg1d.algorithm.get_peaks ---------------------------------------------- +Document: generated/seg1d.algorithm.resample +-------------------------------------------- 1 items passed all tests: 6 tests in default 6 tests in 1 items. @@ -81,32 +57,16 @@ Document: api_basic 13 passed and 0 failed. Test passed. -Document: generated/seg1d.algorithm.rolling_corr ------------------------------------------------- -1 items passed all tests: - 6 tests in default -6 tests in 1 items. -6 passed and 0 failed. -Test passed. - -Document: api_tune ------------------- -1 items passed all tests: - 27 tests in default -27 tests in 1 items. -27 passed and 0 failed. -Test passed. - -Document: code_simple ---------------------- +Document: api_ecg +----------------- 1 items passed all tests: - 6 tests in default -6 tests in 1 items. -6 passed and 0 failed. + 25 tests in default +25 tests in 1 items. +25 passed and 0 failed. Test passed. -Document: generated/seg1d.algorithm.resample --------------------------------------------- +Document: generated/seg1d.Segmenter +----------------------------------- 1 items passed all tests: 6 tests in default 6 tests in 1 items. @@ -121,7 +81,15 @@ Document: generated/seg1d.algorithm.cluster 8 passed and 0 failed. Test passed. -Document: generated/seg1d.Segmenter.segment +Document: api_feat +------------------ +1 items passed all tests: + 17 tests in default +17 tests in 1 items. +17 passed and 0 failed. +Test passed. + +Document: generated/seg1d.algorithm.uniques ------------------------------------------- 1 items passed all tests: 5 tests in default @@ -129,12 +97,12 @@ Document: generated/seg1d.Segmenter.segment 5 passed and 0 failed. Test passed. -Document: generated/seg1d.Segmenter.set_target ----------------------------------------------- +Document: api_tune +------------------ 1 items passed all tests: - 10 tests in default -10 tests in 1 items. -10 passed and 0 failed. + 29 tests in default +29 tests in 1 items. +29 passed and 0 failed. Test passed. Document: start @@ -170,25 +138,57 @@ Got: 37 passed and 1 failed. ***Test Failed*** 1 failures. -Document: api_feat ------------------- +Document: generated/seg1d.algorithm.rolling_corr +------------------------------------------------ 1 items passed all tests: - 17 tests in default -17 tests in 1 items. -17 passed and 0 failed. + 6 tests in default +6 tests in 1 items. +6 passed and 0 failed. Test passed. -Document: generated/seg1d.Segmenter.clear_reference ---------------------------------------------------- +Document: code_simple +--------------------- 1 items passed all tests: - 7 tests in default -7 tests in 1 items. -7 passed and 0 failed. + 6 tests in default +6 tests in 1 items. +6 passed and 0 failed. +Test passed. + +Document: generated/seg1d.Segmenter.set_target +---------------------------------------------- +1 items passed all tests: + 10 tests in default +10 tests in 1 items. +10 passed and 0 failed. +Test passed. + +Document: generated/seg1d.Segmenter.segment +------------------------------------------- +1 items passed all tests: + 5 tests in default +5 tests in 1 items. +5 passed and 0 failed. +Test passed. + +Document: generated/seg1d.algorithm.combine_corr +------------------------------------------------ +1 items passed all tests: + 11 tests in default +11 tests in 1 items. +11 passed and 0 failed. +Test passed. + +Document: generated/seg1d.algorithm.get_peaks +--------------------------------------------- +1 items passed all tests: + 6 tests in default +6 tests in 1 items. +6 passed and 0 failed. Test passed. Doctest summary =============== - 227 tests + 229 tests 1 failure in tests 0 failures in setup code 0 failures in cleanup code diff --git a/docs/build/doctrees/api_basic.doctree b/docs/build/doctrees/api_basic.doctree index 78f2d9f..b43085d 100644 Binary files a/docs/build/doctrees/api_basic.doctree and b/docs/build/doctrees/api_basic.doctree differ diff --git a/docs/build/doctrees/api_ecg.doctree b/docs/build/doctrees/api_ecg.doctree index 8be3cb3..f1eae6c 100644 Binary files a/docs/build/doctrees/api_ecg.doctree and b/docs/build/doctrees/api_ecg.doctree differ diff --git a/docs/build/doctrees/api_tune.doctree b/docs/build/doctrees/api_tune.doctree index ab91737..9784dd4 100644 Binary files a/docs/build/doctrees/api_tune.doctree and b/docs/build/doctrees/api_tune.doctree differ diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle index c628e6d..8e36d0d 100644 Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ diff --git a/docs/build/doctrees/start.doctree b/docs/build/doctrees/start.doctree index b719351..395e9bc 100644 Binary files a/docs/build/doctrees/start.doctree and b/docs/build/doctrees/start.doctree differ diff --git a/docs/build/html/_images/api_ecg-1.png b/docs/build/html/_images/api_ecg-1.png index de5bd81..87d3ab4 100644 Binary files a/docs/build/html/_images/api_ecg-1.png and b/docs/build/html/_images/api_ecg-1.png differ diff --git a/docs/build/html/_images/api_ecg-2.png b/docs/build/html/_images/api_ecg-2.png index 6b91f15..73a8cac 100644 Binary files a/docs/build/html/_images/api_ecg-2.png and b/docs/build/html/_images/api_ecg-2.png differ diff --git a/docs/build/html/_images/api_ecg-3.png b/docs/build/html/_images/api_ecg-3.png index 6d2ac82..a6dccbb 100644 Binary files a/docs/build/html/_images/api_ecg-3.png and b/docs/build/html/_images/api_ecg-3.png differ diff --git a/docs/build/html/_images/api_ecg-4.png b/docs/build/html/_images/api_ecg-4.png index 364522d..5cfdddf 100644 Binary files a/docs/build/html/_images/api_ecg-4.png and b/docs/build/html/_images/api_ecg-4.png differ diff --git a/docs/build/html/_images/api_tune-1.png b/docs/build/html/_images/api_tune-1.png index 1076834..5ebd965 100644 Binary files a/docs/build/html/_images/api_tune-1.png and b/docs/build/html/_images/api_tune-1.png differ diff --git a/docs/build/html/_images/api_tune-2.png b/docs/build/html/_images/api_tune-2.png index 302d9bd..5b474ea 100644 Binary files a/docs/build/html/_images/api_tune-2.png and b/docs/build/html/_images/api_tune-2.png differ diff --git a/docs/build/html/_images/api_tune-3.png b/docs/build/html/_images/api_tune-3.png index e72d835..dec8d63 100644 Binary files a/docs/build/html/_images/api_tune-3.png and b/docs/build/html/_images/api_tune-3.png differ diff --git a/docs/build/html/_images/api_tune-4.png b/docs/build/html/_images/api_tune-4.png index b213ad0..b0d943d 100644 Binary files a/docs/build/html/_images/api_tune-4.png and b/docs/build/html/_images/api_tune-4.png differ diff --git a/docs/build/html/api_basic-1.pdf b/docs/build/html/api_basic-1.pdf index 53568bb..1c32d6d 100644 Binary files a/docs/build/html/api_basic-1.pdf and b/docs/build/html/api_basic-1.pdf differ diff --git a/docs/build/html/api_basic-1.py b/docs/build/html/api_basic-1.py index 3759330..abd5f89 100644 --- a/docs/build/html/api_basic-1.py +++ b/docs/build/html/api_basic-1.py @@ -5,7 +5,7 @@ # Then we generate some data x = np.linspace(-np.pi*2, np.pi*2, 2000) #create an array of data -targ = np.sin(x) # target data from a sin function +targ = np.sin(x) # target data from a sin function t_s,t_e = 200,400 # define a sub-series # To assign the data to the Segmenter, first we create an instance of it and then diff --git a/docs/build/html/api_basic.html b/docs/build/html/api_basic.html index 0c2bf66..5302a87 100644 --- a/docs/build/html/api_basic.html +++ b/docs/build/html/api_basic.html @@ -93,7 +93,7 @@
Then we generate some data
>>> x = np.linspace(-np.pi*2, np.pi*2, 2000) #create an array of data
->>> targ = np.sin(x) # target data from a sin function
+>>> targ = np.sin(x) # target data from a sin function
>>> t_s,t_e = 200,400 # define a sub-series
>>> plt.figure(figsize=(5,3))
>>> plt.plot(refs.T)
+>>> plt.xlabel("time in s")
+>>> plt.ylabel("ECG in mV")
+>>> plt.tight_layout()
>>> plt.show()
>>> plt.figure(figsize=(15,3))
>>> plt.plot(s.t_masked.T)
+>>> plt.xlabel("time in s")
+>>> plt.ylabel("ECG in mV")
+>>> plt.tight_layout()
>>> plt.show()
>>> plt.figure(figsize=(5,3))
>>> plt.plot(refs.T)
+>>> plt.xlabel("time in s")
+>>> plt.ylabel("ECG in mV")
+>>> plt.tight_layout()
>>> plt.show()
>>> plt.figure(figsize=(15,3))
>>> plt.plot(res.T)
->>> plt.show()
+>>> plt.xlabel("time in s")
+>>> plt.ylabel("ECG in mV")
+>>> plt.tight_layout()
+>>> plt.show()
>>> # Plot the target
>>> plt.figure(figsize=(10,3))
>>> plt.plot(x, targ,linewidth=4,alpha=0.5,label='Target')
+>>> plt.xlabel('Angle [rad]')
+>>> plt.ylabel('sin(x)')
>>> plt.legend()
+>>> plt.tight_layout()
>>> plt.show()
>>> plt.figure(figsize=(3,3))
>>> # Plot the reference
>>> plt.plot(x[t_s:t_e], refData,linewidth=4,alpha=0.5,label='Reference')
+>>> plt.xlabel('Angle [rad]')
+>>> plt.ylabel('sin(x)')
>>> plt.legend()
+>>> plt.tight_layout()
>>> plt.show()
In this section, a few simple examples are given to ensure the installation is working and you are able to segment data. These examples call a method provided that uses -default parameters for the algorithms within the segmentation process but contains -the data related parameters such as scaling and step size for the matching process.
+default parameters for the algorithms within the segmentation process but allows +user input for the data related parameters such as scaling and step size for the +matching process.A basic example of checking the installation using the included sample data.
diff --git a/docs/build/plot_directive/api_basic-1.pdf b/docs/build/plot_directive/api_basic-1.pdf index 53568bb..1c32d6d 100644 Binary files a/docs/build/plot_directive/api_basic-1.pdf and b/docs/build/plot_directive/api_basic-1.pdf differ diff --git a/docs/build/plot_directive/api_ecg-1.hires.png b/docs/build/plot_directive/api_ecg-1.hires.png index ce725a7..1a31aba 100644 Binary files a/docs/build/plot_directive/api_ecg-1.hires.png and b/docs/build/plot_directive/api_ecg-1.hires.png differ diff --git a/docs/build/plot_directive/api_ecg-1.pdf b/docs/build/plot_directive/api_ecg-1.pdf index a04080d..a38bcd9 100644 Binary files a/docs/build/plot_directive/api_ecg-1.pdf and b/docs/build/plot_directive/api_ecg-1.pdf differ diff --git a/docs/build/plot_directive/api_ecg-1.png b/docs/build/plot_directive/api_ecg-1.png index de5bd81..87d3ab4 100644 Binary files a/docs/build/plot_directive/api_ecg-1.png and b/docs/build/plot_directive/api_ecg-1.png differ diff --git a/docs/build/plot_directive/api_ecg-2.hires.png b/docs/build/plot_directive/api_ecg-2.hires.png index a418ea6..9009482 100644 Binary files a/docs/build/plot_directive/api_ecg-2.hires.png and b/docs/build/plot_directive/api_ecg-2.hires.png differ diff --git a/docs/build/plot_directive/api_ecg-2.pdf b/docs/build/plot_directive/api_ecg-2.pdf index 3956c0a..9e1fbe8 100644 Binary files a/docs/build/plot_directive/api_ecg-2.pdf and b/docs/build/plot_directive/api_ecg-2.pdf differ diff --git a/docs/build/plot_directive/api_ecg-2.png b/docs/build/plot_directive/api_ecg-2.png index 6b91f15..73a8cac 100644 Binary files a/docs/build/plot_directive/api_ecg-2.png and b/docs/build/plot_directive/api_ecg-2.png differ diff --git a/docs/build/plot_directive/api_ecg-3.hires.png b/docs/build/plot_directive/api_ecg-3.hires.png index d6694e2..55e0f77 100644 Binary files a/docs/build/plot_directive/api_ecg-3.hires.png and b/docs/build/plot_directive/api_ecg-3.hires.png differ diff --git a/docs/build/plot_directive/api_ecg-3.pdf b/docs/build/plot_directive/api_ecg-3.pdf index 8005f10..0660855 100644 Binary files a/docs/build/plot_directive/api_ecg-3.pdf and b/docs/build/plot_directive/api_ecg-3.pdf differ diff --git a/docs/build/plot_directive/api_ecg-3.png b/docs/build/plot_directive/api_ecg-3.png index 6d2ac82..a6dccbb 100644 Binary files a/docs/build/plot_directive/api_ecg-3.png and b/docs/build/plot_directive/api_ecg-3.png differ diff --git a/docs/build/plot_directive/api_ecg-4.hires.png b/docs/build/plot_directive/api_ecg-4.hires.png index 404d5ad..3465b74 100644 Binary files a/docs/build/plot_directive/api_ecg-4.hires.png and b/docs/build/plot_directive/api_ecg-4.hires.png differ diff --git a/docs/build/plot_directive/api_ecg-4.pdf b/docs/build/plot_directive/api_ecg-4.pdf index fa3c220..d89adaf 100644 Binary files a/docs/build/plot_directive/api_ecg-4.pdf and b/docs/build/plot_directive/api_ecg-4.pdf differ diff --git a/docs/build/plot_directive/api_ecg-4.png b/docs/build/plot_directive/api_ecg-4.png index 364522d..5cfdddf 100644 Binary files a/docs/build/plot_directive/api_ecg-4.png and b/docs/build/plot_directive/api_ecg-4.png differ diff --git a/docs/build/plot_directive/api_feat-1.pdf b/docs/build/plot_directive/api_feat-1.pdf index f93bfaf..8a8f5b2 100644 Binary files a/docs/build/plot_directive/api_feat-1.pdf and b/docs/build/plot_directive/api_feat-1.pdf differ diff --git a/docs/build/plot_directive/api_feat-2.pdf b/docs/build/plot_directive/api_feat-2.pdf index d6ffc6f..b8a66de 100644 Binary files a/docs/build/plot_directive/api_feat-2.pdf and b/docs/build/plot_directive/api_feat-2.pdf differ diff --git a/docs/build/plot_directive/api_feat-3.pdf b/docs/build/plot_directive/api_feat-3.pdf index 371202c..fa506d1 100644 Binary files a/docs/build/plot_directive/api_feat-3.pdf and b/docs/build/plot_directive/api_feat-3.pdf differ diff --git a/docs/build/plot_directive/api_feat-4.pdf b/docs/build/plot_directive/api_feat-4.pdf index 51004dd..7efce42 100644 Binary files a/docs/build/plot_directive/api_feat-4.pdf and b/docs/build/plot_directive/api_feat-4.pdf differ diff --git a/docs/build/plot_directive/api_tune-1.hires.png b/docs/build/plot_directive/api_tune-1.hires.png index 3ed6b45..c153f45 100644 Binary files a/docs/build/plot_directive/api_tune-1.hires.png and b/docs/build/plot_directive/api_tune-1.hires.png differ diff --git a/docs/build/plot_directive/api_tune-1.pdf b/docs/build/plot_directive/api_tune-1.pdf index f66a716..98a46de 100644 Binary files a/docs/build/plot_directive/api_tune-1.pdf and b/docs/build/plot_directive/api_tune-1.pdf differ diff --git a/docs/build/plot_directive/api_tune-1.png b/docs/build/plot_directive/api_tune-1.png index 1076834..5ebd965 100644 Binary files a/docs/build/plot_directive/api_tune-1.png and b/docs/build/plot_directive/api_tune-1.png differ diff --git a/docs/build/plot_directive/api_tune-2.hires.png b/docs/build/plot_directive/api_tune-2.hires.png index 30e120d..6d0ad82 100644 Binary files a/docs/build/plot_directive/api_tune-2.hires.png and b/docs/build/plot_directive/api_tune-2.hires.png differ diff --git a/docs/build/plot_directive/api_tune-2.pdf b/docs/build/plot_directive/api_tune-2.pdf index f22f6c1..2e5b848 100644 Binary files a/docs/build/plot_directive/api_tune-2.pdf and b/docs/build/plot_directive/api_tune-2.pdf differ diff --git a/docs/build/plot_directive/api_tune-2.png b/docs/build/plot_directive/api_tune-2.png index 302d9bd..5b474ea 100644 Binary files a/docs/build/plot_directive/api_tune-2.png and b/docs/build/plot_directive/api_tune-2.png differ diff --git a/docs/build/plot_directive/api_tune-3.hires.png b/docs/build/plot_directive/api_tune-3.hires.png index 79f2459..037040e 100644 Binary files a/docs/build/plot_directive/api_tune-3.hires.png and b/docs/build/plot_directive/api_tune-3.hires.png differ diff --git a/docs/build/plot_directive/api_tune-3.pdf b/docs/build/plot_directive/api_tune-3.pdf index 35d99e2..4822d0d 100644 Binary files a/docs/build/plot_directive/api_tune-3.pdf and b/docs/build/plot_directive/api_tune-3.pdf differ diff --git a/docs/build/plot_directive/api_tune-3.png b/docs/build/plot_directive/api_tune-3.png index e72d835..dec8d63 100644 Binary files a/docs/build/plot_directive/api_tune-3.png and b/docs/build/plot_directive/api_tune-3.png differ diff --git a/docs/build/plot_directive/api_tune-4.hires.png b/docs/build/plot_directive/api_tune-4.hires.png index b70d8c7..f713ebc 100644 Binary files a/docs/build/plot_directive/api_tune-4.hires.png and b/docs/build/plot_directive/api_tune-4.hires.png differ diff --git a/docs/build/plot_directive/api_tune-4.pdf b/docs/build/plot_directive/api_tune-4.pdf index 743eaf7..d75d285 100644 Binary files a/docs/build/plot_directive/api_tune-4.pdf and b/docs/build/plot_directive/api_tune-4.pdf differ diff --git a/docs/build/plot_directive/api_tune-4.png b/docs/build/plot_directive/api_tune-4.png index b213ad0..b0d943d 100644 Binary files a/docs/build/plot_directive/api_tune-4.png and b/docs/build/plot_directive/api_tune-4.png differ diff --git a/docs/build/plot_directive/start-1.pdf b/docs/build/plot_directive/start-1.pdf index 97ff5e7..76578db 100644 Binary files a/docs/build/plot_directive/start-1.pdf and b/docs/build/plot_directive/start-1.pdf differ diff --git a/docs/build/plot_directive/start-2.pdf b/docs/build/plot_directive/start-2.pdf index 27cf182..2b59d99 100644 Binary files a/docs/build/plot_directive/start-2.pdf and b/docs/build/plot_directive/start-2.pdf differ diff --git a/docs/source/start.rst b/docs/source/start.rst index 9fc34ac..81ff17b 100644 --- a/docs/source/start.rst +++ b/docs/source/start.rst @@ -4,8 +4,9 @@ Getting Started In this section, a few simple examples are given to ensure the installation is working and you are able to segment data. These examples call a method provided that uses -default parameters for the algorithms within the segmentation process but contains -the data related parameters such as scaling and step size for the matching process. +default parameters for the algorithms within the segmentation process but allows +user input for the data related parameters such as scaling and step size for the +matching process. Sample Data @@ -23,6 +24,7 @@ Sine Wave .. automodule:: seg1d.examples.ex_sine :members: + Gauss ===== diff --git a/seg1d/_about.py b/seg1d/_about.py index caa8677..39d352f 100644 --- a/seg1d/_about.py +++ b/seg1d/_about.py @@ -1 +1 @@ -__version__ = '0.0.16' \ No newline at end of file +__version__ = '0.0.17' \ No newline at end of file