ararpy 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

ararpy/smp/table.py

@@ -12,6 +12,7 @@
 import ast
 import re
 import copy
+import numpy as np
 from .. import calc
 from . import (sample as samples, basic)
 
@@ -46,13 +47,11 @@ def update_table_data(smp: Sample, only_table: str = None):
         elif key == '4':
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.DegasValues]
         elif key == '5':
-            smp.PublishValues[0] = copy.deepcopy(smp.DegasValues[ 0])
-            smp.PublishValues[1] = copy.deepcopy(smp.DegasValues[ 8])
-            smp.PublishValues[2] = copy.deepcopy(smp.DegasValues[10])
-            smp.PublishValues[3] = copy.deepcopy(smp.DegasValues[20])
-            smp.PublishValues[4] = copy.deepcopy(smp.DegasValues[24])
-            smp.PublishValues[5:7] = copy.deepcopy(smp.ApparentAgeValues[2:4])
-            smp.PublishValues[7:9] = copy.deepcopy(smp.ApparentAgeValues[6:8])
+            data = np.array(smp.CorrectedValues)
+            data[1:10:2] = np.abs(np.divide(data[1:10:2], data[0:10:2])) * 100
+            smp.PublishValues[0:10] = copy.deepcopy(data.tolist())
+            smp.PublishValues[10:14] = copy.deepcopy(smp.ApparentAgeValues[0:4])
+            smp.PublishValues[14:16] = copy.deepcopy(smp.ApparentAgeValues[6:8])
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.PublishValues]
         elif key == '6':
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.ApparentAgeValues]
@@ -61,7 +60,10 @@ def update_table_data(smp: Sample, only_table: str = None):
         elif key == '8':
             data = [smp.SequenceName, smp.SequenceValue, smp.IsochronMark, *smp.TotalParam]
         else:
-            data = [['']]
+            raise KeyError(f"Invalid table id")
+
+        data = _normalize_data(
+            data, len(comp.header), smp.Info.experiment.step_num, text_col_indexes=comp.text_indexes)
 
         try:
             params_to_check = {
@@ -95,61 +97,46 @@ def update_handsontable(smp: Sample, data: list, id: str):
 
     """
 
-    def _normalize_data(a, cols, start_col=0):
-        if len(a) >= cols:
-            return a[start_col:cols]
-        else:
-            return a[start_col:] + [[''] * len(a[0])] * (cols - len(a))
-
-    def _strToBool(cols):
-        bools_dict = {
-            'true': True, 'false': False, 'True': True, 'False': False, '1': True, '0': False, 'none': False,
-        }
-        return [bools_dict.get(str(col).lower(), False) for col in cols]
-
-    def _digitize_data(a):
-        # pattern = r'^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$'
-        # return [[ast.literal_eval(str(cell)) if re.fullmatch(pattern, str(cell)) else np.nan if str(cell) == "" else cell for cell in row] for row in a]
-        return a
 
     try:
-        smp.SequenceName = data[0]
+        col3 = _normalize_data(data[0:3], cols=3, rows=len(data[0]), text_col_indexes=[0, 1, 2])
     except IndexError:
-        pass
+        raise
 
     update_all_table = False
     try:
-        if data[1] != smp.SequenceValue or data[2] != smp.IsochronMark:
+        if col3[0] != smp.SequenceName or col3[1] != smp.SequenceValue or col3[2] != smp.IsochronMark:
             update_all_table = True
-            smp.SequenceValue = data[1]
-            smp.IsochronMark = data[2]
+            smp.SequenceName = col3[0]
+            smp.SequenceValue = col3[1]
+            smp.IsochronMark = col3[2]
     except IndexError:
         print(f"Check sequence value / isochron mark failed")
-        pass
-
+        raise
+    n = len(data[0])
     if id == '1':  # 样品值
-        data = _normalize_data(data, len(samples.SAMPLE_INTERCEPT_HEADERS), 3)
+        data = _normalize_data(data, len(samples.SAMPLE_INTERCEPT_HEADERS), n, 3)
         smp.SampleIntercept = _digitize_data(data)
     elif id == '2':  # 本底值
-        data = _normalize_data(data, len(samples.BLANK_INTERCEPT_HEADERS), 3)
+        data = _normalize_data(data, len(samples.BLANK_INTERCEPT_HEADERS), n, 3)
         smp.BlankIntercept = _digitize_data(data)
     elif id == '3':  # 校正值
-        data = _normalize_data(data, len(samples.CORRECTED_HEADERS), 3)
+        data = _normalize_data(data, len(samples.CORRECTED_HEADERS), n, 3)
         smp.CorrectedValues = _digitize_data(data)
     elif id == '4':  # Degas table
-        data = _normalize_data(data, len(samples.DEGAS_HEADERS), 3)
+        data = _normalize_data(data, len(samples.DEGAS_HEADERS), n, 3)
         smp.DegasValues = _digitize_data(data)
     elif id == '5':  # 发行表
-        data = _normalize_data(data, len(samples.PUBLISH_TABLE_HEADERS), 3)
+        data = _normalize_data(data, len(samples.PUBLISH_TABLE_HEADERS), n, 3)
         smp.PublishValues = _digitize_data(data)
     elif id == '6':  # 年龄谱
-        data = _normalize_data(data, len(samples.SPECTRUM_TABLE_HEADERS), 3)
+        data = _normalize_data(data, len(samples.SPECTRUM_TABLE_HEADERS), n, 3)
         smp.ApparentAgeValues = _digitize_data(data)
     elif id == '7':  # 等时线
-        data = _normalize_data(data, len(samples.ISOCHRON_TABLE_HEADERS), 3)
+        data = _normalize_data(data, len(samples.ISOCHRON_TABLE_HEADERS), n, 3)
         smp.IsochronValues = _digitize_data(data)
     elif id == '8':  # 总参数
-        data = _normalize_data(data, len(samples.TOTAL_PARAMS_HEADERS), 3)
+        data = _normalize_data(data, len(samples.TOTAL_PARAMS_HEADERS), n, 3)
         data = _digitize_data(data)
         data[101: 112] = [_strToBool(i) for i in data[101: 112]]
         smp.TotalParam = data
@@ -199,4 +186,50 @@ def update_data_from_table(smp: Sample, only_table: str = None):
             pass
 
 
+def _normalize_data(a, cols, rows, start_col=0, start_row=0, text_col_indexes=[]):
+    if isinstance(a, np.ndarray):
+        a = a.tolist()
+    if not isinstance(a, list):
+        raise ValueError(f"List required, but {type(a)} given.")
+    if len(a) >= cols:
+        a = a[start_col:cols]
+    else:
+        a = a[start_col:] + [[] for j in range(cols - len(a))]
+
+    def f(_, _i):
+        if _i in text_col_indexes:
+            if isinstance(_, type(None)):
+                return ""
+            if isinstance(_, float) and np.isnan(_):
+                return ""
+            return str(_)
+        else:
+            if _ in ["", None, np.nan]:
+                return np.nan
+            elif isinstance(_, str):
+                if _.lower() == 'true':
+                    return 1
+                elif _.lower() == 'false':
+                    return 0
+            return float(_)
+
+    for i in range(cols - start_col):
+        if len(a[i]) >= rows:
+            a[i] = [f(each, i + start_col) for each in a[i][start_row:rows]]
+        else:
+            a[i] = [f(each, i + start_col) for each in a[i][start_row:]] + [f("", i + start_col) for j in range(rows - len(a[i]))]
+
+    return a
+
+
+def _digitize_data(a):
+    # pattern = r'^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$'
+    # return [[ast.literal_eval(str(cell)) if re.fullmatch(pattern, str(cell)) else np.nan if str(cell) == "" else cell for cell in row] for row in a]
+    return a
+
 
+def _strToBool(cols):
+    bools_dict = {
+        'true': True, 'false': False, 'True': True, 'False': False, '1': True, '0': False, 'none': False,
+    }
+    return [bools_dict.get(str(col).lower(), False) for col in cols]

{ararpy-0.2.2.dist-info → ararpy-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ararpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: A project for Ar-Ar geochronology
 Home-page: https://github.com/wuyangchn/ararpy.git
 Author: Yang Wu

{ararpy-0.2.2.dist-info → ararpy-0.2.4.dist-info}/RECORD

@@ -5,13 +5,13 @@ ararpy/Example - Show MDD results.py,sha256=YFkiQual60lyCClsfvivr4REY6waSYuomf0u
 ararpy/Example - Show all Kfs age spectra.py,sha256=1edPtBpFfS0lC7vLnLu34mDHt_xjbc8ptk6rZ--pf-I,12304
 ararpy/Example - Show random walk results.py,sha256=8WWvbAI7ySiMR-XwtFe5kTQihW3mcqzL3S7EUZdoxYo,15477
 ararpy/Example - Tc calculation.py,sha256=sD9pu3IaZ8mBV95rV2wOEhlQUexFNqBUoBqnNMdUBis,19617
-ararpy/__init__.py,sha256=wz69XzhfcI0QMPU2QJ8gZoWEsG2vHeSE7b5E7GytwI0,6767
+ararpy/__init__.py,sha256=H-LaMP-KRGnQMY-ocBUgmRe9vohsJqj9gR-O_DZXSp0,5386
 ararpy/test.py,sha256=4F46-JJ1Ge12HGae0qO44Qc6kiEMHBgn2MsY_5LlHDo,3973
 ararpy/calc/__init__.py,sha256=kUjRuLE8TLuKOv3i976RnGJoEMj23QBZDu37LWs81U4,322
 ararpy/calc/age.py,sha256=WOZs70zXiBWDIEhXJLIaNiYTOFJNk0NDbH5e5zCbCks,5435
-ararpy/calc/arr.py,sha256=x6z16N2H6QFYAPY11lnPRFZsZfwWu2tSEo87q7M9Ym4,14869
+ararpy/calc/arr.py,sha256=Kiads9ABfcBA3j_e_ZvpQou7tH-voOONoYFN2B8U5ak,15006
 ararpy/calc/basic.py,sha256=AMQrhkNHhHtiguqTe4GPOYLuV8TEJBXpRJXJAoOwD9w,4634
-ararpy/calc/corr.py,sha256=qh77w1uJ98x6b_N-0_u1seWc7YLtCRClpxG6fuYHx-M,21667
+ararpy/calc/corr.py,sha256=e9HGsD1GCS_Kv7X_dFYachBxAJgeKg2GP--fvZHedns,21609
 ararpy/calc/err.py,sha256=63LtprqjemlIb1QGDst4Ggcv5KMSDHdlAIL-nyQs1eA,2691
 ararpy/calc/histogram.py,sha256=0GVbDdsjd91KQ1sa2B7NtZ4KGo0XpRIJapgIrzAwQUo,5777
 ararpy/calc/isochron.py,sha256=ej9G2e68k6yszonWHsLcEubh3TA7eh1upTJP_X0ttAA,5726
@@ -42,32 +42,32 @@ ararpy/examples/sample-default.smp,sha256=YNkoQGgPrsL_fXS7ZHxfRtLQWekCDqT9czS6vB
 ararpy/files/__init__.py,sha256=l5B5ZQ01WdtvjjN0aMkyAFNgpwANdM_1I0tQbqnRuEY,69
 ararpy/files/arr_file.py,sha256=pD5MxkAydL7cNq2wmKFUaOU4jHhc3MzTYrwbxZ3f46w,881
 ararpy/files/basic.py,sha256=k2GXgZjhqSmKvpXQLjsXDksS_ZLvqD7AWW54fXnYvTI,1228
-ararpy/files/calc_file.py,sha256=CmZsgUj2t2FnLcCE38pbOqej7M-CbhQs6KMFXE3PbQA,29233
+ararpy/files/calc_file.py,sha256=-CZXmlHVf65hKMLhwp6eSewbxzxywXcnpycoEeLDhZA,29304
 ararpy/files/new_file.py,sha256=efblARIBROVLWS2w3-98BxLX5VZ8grRpiTkJFtf_rAk,214
 ararpy/files/raw_file.py,sha256=X2_RjlNOUbdkA9MM2ZMNlZmGL7jc1-eV-Wy-bIu2bb0,20592
 ararpy/files/xls.py,sha256=DVcZ_yRnc19p-m4leGGjt-YPDpSa2udYKmGyrM0qub0,640
 ararpy/smp/EXPORT_TO_PDF_DATA_PROPERTIES.py,sha256=baDM437tu6hsPv0uYfod0TREXlPd6kvMBFT1S9ZZlkk,3024
 ararpy/smp/__init__.py,sha256=k6_fa27UJsQK7K7oC5GYlwMo6l0Xd8af3QtOrZz2XJk,478
-ararpy/smp/basic.py,sha256=uJJjQajTzg4X7tg4loTgg8ilvWJqBhZIYmIXY_F-VUQ,28601
+ararpy/smp/basic.py,sha256=MBvUXF1KlKcm-W4WLlIhUQ5AhJQ9lUEwIwSy1NMFiq8,28812
 ararpy/smp/calculation.py,sha256=4Vg0HNbAGdTVdYIt17WeoKPmrTjmq9EqaP44P8AxT9U,2874
 ararpy/smp/consts.py,sha256=XIdjdz8cYxspG2jMnoItdlUsxr3hKbNFJjMZJh1bpzw,393
-ararpy/smp/corr.py,sha256=FBovb2T-pkrjq1OGVh0znYijQYw3BdRLTqoeHzUDHF4,38049
+ararpy/smp/corr.py,sha256=uZY3P5TLuXK1kwDXWqF6zWHPiEH0Ovsx9L6xonzDYhY,37844
 ararpy/smp/diffusion_funcs.py,sha256=X6LC1XY-vub5BpAuZMlyA5k3DQcU8Qqf5uukwGjJOxw,186690
-ararpy/smp/export.py,sha256=nJhyPtrbOYR30JncePNKR87IpCzVgy4wyo6FZ0kJMEY,120438
+ararpy/smp/export.py,sha256=XnLKjWk4LFqtqXdy2qCUkOLy0vkjMq-X-tE9A545BVE,120439
 ararpy/smp/info.py,sha256=tpEIjrE4nR-GAYTricBk9gq0LuHh6F1Bt7HPo1rS2HM,497
-ararpy/smp/initial.py,sha256=hSDU3nptrECErDDgGcrLB0g7UmcnRshY_rv1YG0jdmw,19270
+ararpy/smp/initial.py,sha256=o3KcEx9nCIVJtdmy6BX_JZ_SjOmzWjAMffdm8JM01Vo,20119
 ararpy/smp/json.py,sha256=zfJCC_2LCDckqC8Fpu10jEA6Knl3UtKO31I5g4fvsBE,2273
-ararpy/smp/plots.py,sha256=hU3VyAyEkR_3enWvMHfuL_Ajjg-cK9f7SUHBKwHkmVQ,32577
+ararpy/smp/plots.py,sha256=SrYlTFUzfcKnUnhVf04dyGx0eJmR2mbjG0VRE8LTJnU,34202
 ararpy/smp/raw.py,sha256=77J1dEYL4ZSeftp4tyog_Cy1Y5bwHNaLqJK4i4KLOSY,6500
-ararpy/smp/sample.py,sha256=tCDCAS_KgJy4qN1nCGWTikZfsBu5EV1giccLI3gRY5g,60066
-ararpy/smp/style.py,sha256=kP1YnyAoVbKXfEARsrCiz0lTYipW3xEKqR4vIfuVNe4,8206
-ararpy/smp/table.py,sha256=9D1oGlYtoVgRte5lxOWYZbEManyudO5un-t7V6LQ-qg,7351
+ararpy/smp/sample.py,sha256=ICW-Sy1fePQLMJLT8wR4KIK8Ikcc0zzeXBZ55gVxI3s,60478
+ararpy/smp/style.py,sha256=P7pAgBVpUzviJWyMiJXRE_NpzDf3ncNtFmUJHQGNFw0,8446
+ararpy/smp/table.py,sha256=iXJilp0V_kDyuTycjV82fBimuzLmVciAaL_av0zIb5Y,8540
 ararpy/thermo/__init__.py,sha256=6VBuqTRFl403PVqOuMkVrut0nKaQsAosBmfW91X1dMg,263
 ararpy/thermo/arrhenius.py,sha256=Ass1ichHfqIAtpv8eLlgrUc1UOb3Urh1qzr1E3gLB4U,233
 ararpy/thermo/atomic_level_random_walk.py,sha256=ncw9DtxRfS6zlQbLVLNX7WNoO9sX_nSomwAsTH0_O3k,25910
 ararpy/thermo/basic.py,sha256=JJRZbYmvXlpRAV2FeFPwLhrig4ZhNQmJnWqgOjo-1YQ,11508
-ararpy-0.2.2.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
-ararpy-0.2.2.dist-info/METADATA,sha256=wvnw6khN1TWEJEGRbAunuJ3A95geGtqgvmAwCN7wGAc,24726
-ararpy-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ararpy-0.2.2.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
-ararpy-0.2.2.dist-info/RECORD,,
+ararpy-0.2.4.dist-info/licenses/LICENSE,sha256=cvG5t_C1qY_zUyJI7sNOa7gCArdngNPaOrfujl2LYuc,1085
+ararpy-0.2.4.dist-info/METADATA,sha256=KaF8mrbZECHMeFN-h3w2r6YA9g6j04ozGPQ13-CoeRc,24726
+ararpy-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ararpy-0.2.4.dist-info/top_level.txt,sha256=9iTpsPCYuRYq09yQTk9d2lqB8JtTEOmbN-IcGB-K3vY,7
+ararpy-0.2.4.dist-info/RECORD,,