actinet 0.0.dev6__tar.gz → 0.1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {actinet-0.0.dev6 → actinet-0.1.0}/PKG-INFO +1 -1
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/__init__.py +2 -2
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/_version.py +3 -3
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/actinet.py +1 -1
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/prepare.py +13 -1
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/PKG-INFO +1 -1
- {actinet-0.0.dev6 → actinet-0.1.0}/LICENSE.md +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/README.md +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/pyproject.toml +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/setup.cfg +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/setup.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/accPlot.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/circadian.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/evaluate.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/hmm.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/models.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/sslmodel.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/summarisation.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/utils/__init__.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/utils/collate_outputs.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/utils/generate_commands.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet/utils/utils.py +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/SOURCES.txt +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/dependency_links.txt +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/entry_points.txt +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/requires.txt +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/src/actinet.egg-info/top_level.txt +0 -0
- {actinet-0.0.dev6 → actinet-0.1.0}/versioneer.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: actinet
|
|
3
|
-
Version: 0.0
|
|
3
|
+
Version: 0.1.0
|
|
4
4
|
Summary: Activity detection algorithm compatible with the UK Biobank Accelerometer Dataset
|
|
5
5
|
Home-page: https://github.com/OxWearables/actinet
|
|
6
6
|
Download-URL: https://github.com/OxWearables/actinet
|
|
@@ -4,8 +4,8 @@ __maintainer__ = "Shing Chan"
|
|
|
4
4
|
__maintainer_email__ = "shing.chan@ndph.ox.ac.uk"
|
|
5
5
|
__license__ = "See LICENSE file."
|
|
6
6
|
|
|
7
|
-
__classifier_version__ = "
|
|
8
|
-
__classifier_md5__ = "
|
|
7
|
+
__classifier_version__ = "ssl-ukb-c24-rw-20240308"
|
|
8
|
+
__classifier_md5__ = "b0a345b5d98a179e3deb60625b980796"
|
|
9
9
|
|
|
10
10
|
from . import _version
|
|
11
11
|
|
|
@@ -8,11 +8,11 @@ import json
|
|
|
8
8
|
|
|
9
9
|
version_json = '''
|
|
10
10
|
{
|
|
11
|
-
"date": "2024-03-
|
|
11
|
+
"date": "2024-03-12T14:09:43+0000",
|
|
12
12
|
"dirty": false,
|
|
13
13
|
"error": null,
|
|
14
|
-
"full-revisionid": "
|
|
15
|
-
"version": "0.0
|
|
14
|
+
"full-revisionid": "e9d1d4060f3950f1e6c52610552d0c9a3e9189a7",
|
|
15
|
+
"version": "0.1.0"
|
|
16
16
|
}
|
|
17
17
|
''' # END VERSION_JSON
|
|
18
18
|
|
|
@@ -19,7 +19,7 @@ from actinet.models import ActivityClassifier
|
|
|
19
19
|
from actinet.summarisation import getActivitySummary
|
|
20
20
|
from actinet.utils.utils import infer_freq
|
|
21
21
|
|
|
22
|
-
BASE_URL = "https://
|
|
22
|
+
BASE_URL = "https://wearables-files.ndph.ox.ac.uk/files/actinet/models/"
|
|
23
23
|
|
|
24
24
|
|
|
25
25
|
def main():
|
|
@@ -292,7 +292,19 @@ def prepare_participant_accelerometer_data(pid, annotations_file, verbose=False)
|
|
|
292
292
|
"Walmsley2020",
|
|
293
293
|
)
|
|
294
294
|
|
|
295
|
-
|
|
295
|
+
features = (
|
|
296
|
+
["enmoTrunc", "enmoAbs", "xMean", "yMean", "zMean", "xRange"]
|
|
297
|
+
+ ["yRange", "zRange", "xStd", "yStd", "zStd", "xyCov", "xzCov", "yzCov"]
|
|
298
|
+
+ ["mean", "sd", "coefvariation", "median", "min", "max", "25thp", "75thp"]
|
|
299
|
+
+ ["autocorr", "corrxy", "corrxz", "corryz", "avgroll", "avgpitch"]
|
|
300
|
+
+ ["avgyaw", "sdroll", "sdpitch", "sdyaw", "rollg", "pitchg", "yawg"]
|
|
301
|
+
+ ["fmax", "pmax", "fmaxband", "pmaxband", "entropy", "fft1", "fft2"]
|
|
302
|
+
+ ["fft3", "fft4", "fft5", "fft6", "fft7", "fft8", "fft9", "fft10", "MAD"]
|
|
303
|
+
+ ["MPD", "skew", "kurt", "avgArmAngel", "avgArmAngelAbsDiff", "f1", "p1"]
|
|
304
|
+
+ ["f2", "p2", "f625", "p625", "totalPower"]
|
|
305
|
+
)
|
|
306
|
+
|
|
307
|
+
X = features_file[features].to_numpy()
|
|
296
308
|
Y, T = Y[: len(X)], T[: len(X)]
|
|
297
309
|
P = np.array([f"P{pid:03}"] * len(X))
|
|
298
310
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: actinet
|
|
3
|
-
Version: 0.0
|
|
3
|
+
Version: 0.1.0
|
|
4
4
|
Summary: Activity detection algorithm compatible with the UK Biobank Accelerometer Dataset
|
|
5
5
|
Home-page: https://github.com/OxWearables/actinet
|
|
6
6
|
Download-URL: https://github.com/OxWearables/actinet
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|