scilens 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

scilens/components/compare_errors.py

@@ -11,12 +11,16 @@ class CompareErrors:
 		if not B:A.root_group=C
 		A.groups.append(C);return id,C
 	def add(A,group,comp_res,info=_A):
-		F=group;C=comp_res;D=C.severity;E=C.message;G=C.comp_err
-		if A.ignore_warnings and D==SEVERITY_WARNING:return _B
-		A.count+=1;B=A._messages_map.get(E)
-		if B is _A:B=len(A.messages);A.messages.append(E);A._messages_map[E]=B
-		A.errors[D].append(CompareErr(err=G,msg=B,group=F.id,info=info));F.incr(D)
-		if A.count>=A.nb_max:A.limit_reached=True;return True
+		G=True;D=comp_res;B=group
+		if A.limit_reached:
+			if not B.error:B.error=f"Limit errors reached ({A.nb_max})"
+			return G
+		E=D.severity;F=D.message;H=D.comp_err
+		if A.ignore_warnings and E==SEVERITY_WARNING:return _B
+		A.count+=1;C=A._messages_map.get(F)
+		if C is _A:C=len(A.messages);A.messages.append(F);A._messages_map[F]=C
+		A.errors[E].append(CompareErr(err=H,msg=C,group=B.id,info=info));B.incr(E)
+		if A.count>=A.nb_max:B.error=f"Limit errors reached ({A.nb_max})";A.limit_reached=G;return G
 	def get_data(B):
 		D=[{'id':A.id,'type':A.type,'name':A.name,'error':A.error,'total_diffs':A.total_diffs,'total_warnings':A.total_warnings,'total_errors':A.total_errors,'data':A.data,'info':A.info,'parent_id':A.parent.id if A.parent else _A}for A in B.groups];A={'messages':B.messages,'groups':D}
 		for(C,E)in B.errors.items():A[C]=[A.model_dump()for A in E];A[C+'_nb']=len(A[C])

scilens/components/compare_floats.py

@@ -62,7 +62,7 @@ class CompareFloats:
 			for j in range(test_nb_columns):
 				diff=test_mat[i][j]-ref_mat[i][j]
 				if diff==0:continue
-				else:diffs_count+=1
+				else:diffs_count+=1;group.incr('diff')
 				if err_limit_reached:continue
 				res_compare=self.compare_2_values(test_mat[i][j],ref_mat[i][j])
 				if res_compare:

scilens/readers/cols_dataset.py

@@ -26,22 +26,21 @@ def cols_dataset_get_curves_col_x(cols_dataset,col_x):
 	for D in J:B=A.data[C];K=A.data[D];L={I:A.names[D],'short_title':A.names[D],'series':[[B[A],K[A]]for A in range(A.rows_count)],_C:D};F+=[L];M={I:A.names[D],'type':'simple','xaxis':A.names[C],'yaxis':A.names[D],_B:[len(F)-1]};H+=[M]
 	return{_B:F,_E:H},E
 def compare(group,compare_floats,reader_test,reader_ref,cols_curve):
-	J='Errors limit reached';F=reader_ref;E=group;C=cols_curve;A=reader_test;logging.debug(f"compare cols: {E.name}")
-	if len(A.numeric_col_indexes)!=len(F.numeric_col_indexes):E.error=f"Number Float columns indexes are different: {len(A.numeric_col_indexes)} != {len(F.numeric_col_indexes)}";return
-	D=[''for A in range(A.cols_count)];K=_A;G=_A
-	if C and C.type==ReaderCurveParserNameConfig.COL_X:L=C.info[_D];K=A.data[L];G=A.names[L]
-	H=False
+	O='Errors limit reached';F=reader_ref;D=group;C=cols_curve;A=reader_test;logging.debug(f"compare cols: {D.name}")
+	if len(A.numeric_col_indexes)!=len(F.numeric_col_indexes):D.error=f"Number Float columns indexes are different: {len(A.numeric_col_indexes)} != {len(F.numeric_col_indexes)}";return
+	E=[''for A in range(A.cols_count)];I=_A;G=_A
+	if C and C.type==ReaderCurveParserNameConfig.COL_X:J=C.info[_D];I=A.data[J];G=A.names[J]
+	K=False
 	for B in range(A.cols_count):
 		if B not in A.numeric_col_indexes:continue
-		if H:D[B]=J;continue
-		P=A.data[B];Q=F.data[B];logging.debug(f"compare cols: {A.names[B]}");M,R,T=compare_floats.add_group_and_compare_vectors(A.names[B],E,{'info_prefix':G}if G else _A,P,Q,info_vector=K)
-		if R:H=True;D[B]=J;continue
-		if M.total_errors>0:D[B]=f"{M.total_errors} comparison errors"
+		P=A.data[B];Q=F.data[B];logging.debug(f"compare cols: {A.names[B]}");L,R,T=compare_floats.add_group_and_compare_vectors(A.names[B],D,{'info_prefix':G}if G else _A,P,Q,info_vector=I)
+		if R:K=True;E[B]=O;continue
+		if L.total_errors>0:E[B]=f"{L.total_errors} comparison errors"
 	if C:
-		for N in C.curves[_E]:
-			O=0
-			for S in N[_B]:
-				I=C.curves[_B][S]
-				if D[I[_C]]:I['comparison_error']=D[I[_C]];O+=1
-			N['comparison']={'curves_nb_with_error':O}
-	E.error=J if H else _A;E.info={'cols_has_error':D}
+		for M in C.curves[_E]:
+			N=0
+			for S in M[_B]:
+				H=C.curves[_B][S]
+				if E[H[_C]]:H['comparison_error']=E[H[_C]];N+=1
+			M['comparison']={'curves_nb_with_error':N}
+	D.error=O if K else _A;D.info={'cols_has_error':E}

scilens/report/templates/compare_13_section_numbers.html

@@ -1,9 +1,24 @@
 {% if file.comparison_errors %}
 {% for group in file.comparison_errors.groups if group.type != 'node' %}
 
+{% set group_status = 'ERROR' if group.error or group.total_errors else ('WARNING' if group.total_warnings else 'SUCCESS') %}
+
+<h4>
+    {{ group.name }}
+    <span class="{{ group_status }}">{{ group_status }}</span>
+    <span class="text-xs rounded-lg mx-1 my-1">Err: {{ group.total_errors }}</span>
+    <span class="text-xs rounded-lg mx-1 my-1">Warn: {{ group.total_warnings }}</span>
+    <span class="text-xs rounded-lg mx-1 my-1">Diffs: {{ group.total_diffs }}</span>
+</h4>
+
+{% if group.error %}
+<div>
+  <span class="ERROR"><code>{{ group.error }}</code></span>
+</div>
+{% endif %}
+
 {% if group.total_warnings or group.total_errors %}
 
-<h4>{{ group.name }}</h4>
 {% include 'compare_13_section_numbers_table.html' with context %}
 
 {% endif %}

{scilens-0.3.2.dist-info → scilens-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scilens
-Version: 0.3.2
+Version: 0.3.4
 Summary: A CesGensLaB framework for data collecting and deep analysis
 Home-page: https://scilens.dev
 License: Proprietary

{scilens-0.3.2.dist-info → scilens-0.3.4.dist-info}/RECORD

@@ -9,8 +9,8 @@ scilens/cli/main.py,sha256=LljcS0s2E35y4YZpV01GhMhMK9HyRRHYmxc_q_kSurI,6004
 scilens/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/components/analyse_folder.py,sha256=yqc-dscKaHLZJCYeXGak2v0c3F2aeX0E11AFPfya6r0,208
 scilens/components/compare_2_files.py,sha256=U4xumE28ijFbnrTPH8FgRyR_b5f04jOjaCmegJvCvSE,1483
-scilens/components/compare_errors.py,sha256=Kw_zpVmA3Fb7yVDXog2poLaTsV_K81eLqv-z-b73Nlw,1495
-scilens/components/compare_floats.py,sha256=zMrFmlGr97kfRUrw2A9cJiO9I-RIoQMgaWRZwNEJQ0k,5598
+scilens/components/compare_errors.py,sha256=vGb4DWP89HMIeBm0dZU2nt-ksppAs_37xtCHaPd0w5Y,1640
+scilens/components/compare_floats.py,sha256=p1lnnwkGJXIsb6Y5psQc_5FcOuB2vP_cIQHXhZjWPXc,5617
 scilens/components/compare_folders.py,sha256=LZ1AuYxLVHMNbtXWXQrdms4vZgOQthvDy-8NFD_EFjc,2617
 scilens/components/compare_models.py,sha256=SCPd747h_nd4ewZsqLB6CFr27v6q99NELJb-gpkdj0o,918
 scilens/components/executor.py,sha256=j5xejkCaaPyl3V38Q4HxxXcAx4Tnj8CILAjSJ1G7OIE,3417
@@ -47,7 +47,7 @@ scilens/processors/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 scilens/processors/models/results.py,sha256=KoWxh13Zgi7PuPql8hkf4VjCis42ZxAuzIgJxBWVaX8,119
 scilens/processors/processor_interface.py,sha256=jzMp1529JXnMGTJijVy6b_1zmARAMNv70f2lgys7vn4,452
 scilens/readers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scilens/readers/cols_dataset.py,sha256=V4tAokAwY9_eVfyH-UINztxzJUcLJRk1CdaZprs8Wfk,2475
+scilens/readers/cols_dataset.py,sha256=C4N030_Iqq5KZVpQ0NVjAw4DctALuz_YBb6f6yi35Jk,2452
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/mat_dataset.py,sha256=-2NJJxOu8qEMhni-kGT9F-MwDA98_Nrt2cC0TYMUNvw,1180
 scilens/readers/reader_csv.py,sha256=aPd2IxFiUXYmH_EpNZkCHV1oMWctZW7YSPwC8q75SIo,3490
@@ -68,7 +68,7 @@ scilens/report/templates/body_99_footer.html,sha256=8cWebeWfZwZ-9bYAMZkZj8rbCWq3
 scilens/report/templates/compare_11_summary.html,sha256=4rxBlOxTcn59ztYtqDbi6SRQXlaz30HkVl7dJpzCmZE,3776
 scilens/report/templates/compare_12_sections.html,sha256=HWsfCmfdleyRK6IHJeMEheenOuyA0mLzOZ-0qLcuzJU,5952
 scilens/report/templates/compare_13_section_numbers copy.html,sha256=0PWK_I2kNX3LjPLkkY4eSYIeB7YFkA28nk-PPLDhnaY,1753
-scilens/report/templates/compare_13_section_numbers.html,sha256=FpIYAVXRiWf2zrJtjy2fWPdit_RNbHP2zQLQYScIrtY,291
+scilens/report/templates/compare_13_section_numbers.html,sha256=9etEMSqwrDyJIn_nMbKEVaDgnFL_hBxSjPR-hU2wgDI,851
 scilens/report/templates/compare_13_section_numbers_table.html,sha256=sJy6ZYtjl80vM1b3oqZSXawZWp7KNIwLI_wCnvBwYPE,3270
 scilens/report/templates/index.html,sha256=mNTu-CAzEJ2rhz81cHAdmT_KcQeOQ3b_FSC73NPEi0U,3670
 scilens/report/templates/js_chartlibs_echarts.js,sha256=6YicVhTNIBmmBpV31XCVN5oBeiD0t29JIosJZRUv01M,907
@@ -97,7 +97,7 @@ scilens/utils/template.py,sha256=9dlXX3nmfzDRUwzPJOkoxk15UXivZ2SW-McdCwokFa4,443
 scilens/utils/time_tracker.py,sha256=DdVBoMpVLXrX0qZZXyLm4g38EwDVLlRcBqcpNex1mYY,545
 scilens/utils/vectors.py,sha256=4N2BZSC5n3HgZqPujDGF5NdjVmSL1rOHb_qw4OoABQY,103
 scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
-scilens-0.3.2.dist-info/METADATA,sha256=Ai0hRZvMpFmjtACkOdVl9WPycq1MjI9Ih_s1AbAiqjI,1367
-scilens-0.3.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.3.2.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.3.2.dist-info/RECORD,,
+scilens-0.3.4.dist-info/METADATA,sha256=rLCgHhgfF0utkAo-hIq5y2IBXTV_GcLjdcQLSeqpnh0,1367
+scilens-0.3.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.3.4.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.3.4.dist-info/RECORD,,