libgunshotmatch 0.11.1__py3-none-any.whl → 0.11.2__py3-none-any.whl

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.

Potentially problematic release.

This version of libgunshotmatch might be problematic. Click here for more details.

Files changed (7) hide show
  1. libgunshotmatch/__init__.py +1 -1
  2. libgunshotmatch/comparison/projects.py +6 -3
  3. {libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/METADATA +2 -2
  4. {libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/RECORD +7 -7
  5. {libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/LICENSE +0 -0
  6. {libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/WHEEL +0 -0
  7. {libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/entry_points.txt +0 -0
libgunshotmatch/__init__.py CHANGED
@@ -29,5 +29,5 @@ Base library for GunShotMatch.
29
29
  __author__: str = "Dominic Davis-Foster"
30
30
  __copyright__: str = "2020-2023 Dominic Davis-Foster"
31
31
  __license__: str = "MIT License"
32
- __version__: str = "0.11.1"
32
+ __version__: str = "0.11.2"
33
33
  __email__: str = "dominic@davis-foster.co.uk"
libgunshotmatch/comparison/projects.py CHANGED
@@ -52,15 +52,18 @@ def filter_alignment_to_consolidate(project: Project) -> Alignment:
52
52
 
53
53
  # Sort expr_code and peakpos into order from datafile_data
54
54
  desired_order = list(project.datafile_data)[::-1]
55
- sort_map = [desired_order.index(code) for code in project.alignment.expr_code]
55
+ sort_map = [project.alignment.expr_code.index(code) for code in desired_order]
56
56
  expr_code = [project.alignment.expr_code[idx] for idx in sort_map]
57
57
  peakpos = [project.alignment.peakpos[idx] for idx in sort_map]
58
+ assert desired_order == expr_code
58
59
 
59
- consolidated_peak_retention_times = [cp.rt_list for cp in project.consolidated_peaks]
60
+ consolidated_peak_retention_times = []
61
+ for cp in project.consolidated_peaks:
62
+ consolidated_peak_retention_times.append([None if numpy.isnan(rt) else rt for rt in cp.rt_list])
60
63
 
61
64
  aligned_peaks_surviving_consolidate = []
62
65
  for aligned_peaks in zip(*peakpos):
63
- aprt = [p.rt for p in reversed(aligned_peaks)]
66
+ aprt = [None if p is None else p.rt for p in reversed(aligned_peaks)]
64
67
  if aprt in consolidated_peak_retention_times:
65
68
  aligned_peaks_surviving_consolidate.append(aligned_peaks)
66
69
 
{libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: libgunshotmatch
3
- Version: 0.11.1
3
+ Version: 0.11.2
4
4
  Summary: Base library for GunShotMatch.
5
5
  Author-email: Dominic Davis-Foster <dominic@davis-foster.co.uk>
6
6
  License: MIT
@@ -135,7 +135,7 @@ libgunshotmatch
135
135
  .. |language| image:: https://img.shields.io/github/languages/top/GunShotMatch/libgunshotmatch
136
136
  :alt: GitHub top language
137
137
 
138
- .. |commits-since| image:: https://img.shields.io/github/commits-since/GunShotMatch/libgunshotmatch/v0.11.1
138
+ .. |commits-since| image:: https://img.shields.io/github/commits-since/GunShotMatch/libgunshotmatch/v0.11.2
139
139
  :target: https://github.com/GunShotMatch/libgunshotmatch/pulse
140
140
  :alt: GitHub commits since tagged version
141
141
 
{libgunshotmatch-0.11.1.dist-info → libgunshotmatch-0.11.2.dist-info}/RECORD RENAMED
@@ -1,13 +1,13 @@
1
1
  libgunshotmatch/comparison/__init__.py,sha256=g-KDfzG-oyRf2aeXlMaJJ3aWfQtQkr5-bGhT70O44XA,3848
2
2
  libgunshotmatch/comparison/_utils.py,sha256=aZ6fnFM4M_vTsKq5t79V4tfven1eVdG4EUCuYFuXMVs,1895
3
- libgunshotmatch/comparison/projects.py,sha256=Dq294cDndmQI2FnIcVXwleCQF0mF2m8U5wWnO5_aD9A,3356
3
+ libgunshotmatch/comparison/projects.py,sha256=fN1-dbD8LNPKcMerKHQwwOVeOwFPcd6E9hZ8QQFJOi4,3505
4
4
  libgunshotmatch/comparison/unknowns.py,sha256=kvJJDtfpMp-c3hjCOz7YtvuuDR0YksWmyUuaSBC_5Jg,2710
5
5
  libgunshotmatch/consolidate/__init__.py,sha256=qjY5meI2TMCpMGwzLSo4NZ4HbhH8VJoR1t9ev4ObBmA,24706
6
6
  libgunshotmatch/consolidate/_fields.py,sha256=0kfPXJ0EG7GhdFiNzvcmd6W4i1x6Y0s2Y58z3RltPiA,2759
7
7
  libgunshotmatch/consolidate/_spectra.py,sha256=24aDoPwGWEyIFCH-fwRa4nifNMPqUyd-qTogk3BMeLY,2319
8
8
  libgunshotmatch/method/__init__.py,sha256=TP_3rvv3WEbV6Y5E_QWd2lcORPFnbXV4YRKGwXDa4ds,9423
9
9
  libgunshotmatch/method/_fields.py,sha256=HBFl0XmHBaAOHYdABs2NRbjtngGEw7kY0xP6D2Fl7h4,4941
10
- libgunshotmatch/__init__.py,sha256=RYV-3nDk5ruAuFXDnZuk5LbiFM_503YfSuKwtGTdddk,1434
10
+ libgunshotmatch/__init__.py,sha256=lhPHsIA1fV4-AthZzJMJX-Dh6rkKtlDbpJr6NwqxJUY,1434
11
11
  libgunshotmatch/datafile.py,sha256=4C4BiR95PBfIUbiUKQzVfh57tgZu_l6rLS8bIgrgPUs,16246
12
12
  libgunshotmatch/gzip_util.py,sha256=PcfT4QC4TM0KI3uCGetRpjChbTXTGmNEJBr7BghO3i8,2414
13
13
  libgunshotmatch/peak.py,sha256=jIbuOTj_FWTeb46pZtzSwnGsMK_c71Dd9_T9Gj2DxNk,17616
@@ -15,8 +15,8 @@ libgunshotmatch/project.py,sha256=498xoKkDSFDsFodwoRwwEfRL-FOX_hnzyDLLgPNxWr0,69
15
15
  libgunshotmatch/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
16
  libgunshotmatch/search.py,sha256=GMP7_DMnXFq3TG8AT1WARIn4ObCfOGfTDakpGeKzJYw,3123
17
17
  libgunshotmatch/utils.py,sha256=7WVJPd9wNBFFoAFqh2J6Lsu7BGrGksW32ZqpH7ZIL_I,5776
18
- libgunshotmatch-0.11.1.dist-info/LICENSE,sha256=bFtJt-lyVJHV-88FeFa_r3BEOsmpna5qG2KOl9JUNfU,1064
19
- libgunshotmatch-0.11.1.dist-info/METADATA,sha256=X6IRaQ7QLl3ugK51lSmpa205f0Ds1QmbVICEaFucBtw,6394
20
- libgunshotmatch-0.11.1.dist-info/WHEEL,sha256=pUf8gZsdmDXXTtqZfolZFpfoEwFoEdADIuUvQVl5qAY,83
21
- libgunshotmatch-0.11.1.dist-info/entry_points.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
22
- libgunshotmatch-0.11.1.dist-info/RECORD,,
18
+ libgunshotmatch-0.11.2.dist-info/LICENSE,sha256=bFtJt-lyVJHV-88FeFa_r3BEOsmpna5qG2KOl9JUNfU,1064
19
+ libgunshotmatch-0.11.2.dist-info/METADATA,sha256=tw4qWWLNVGSQ6G2HmuxcCAwWFYRPyaKmK58JAm_3LDk,6394
20
+ libgunshotmatch-0.11.2.dist-info/WHEEL,sha256=pUf8gZsdmDXXTtqZfolZFpfoEwFoEdADIuUvQVl5qAY,83
21
+ libgunshotmatch-0.11.2.dist-info/entry_points.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
22
+ libgunshotmatch-0.11.2.dist-info/RECORD,,