scilens 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

scilens/readers/cols_dataset.py

@@ -69,23 +69,24 @@ class ColsDataset:
 @dataclass
 class ColsCurves:type:str;info:dict;curves:dict
 def compare(group,compare_floats,reader_test,reader_ref,cols_curve):
-	R='Errors limit reached';G=reader_ref;E=compare_floats;D=group;C=cols_curve;A=reader_test;logging.debug(f"compare cols: {D.name}")
-	if len(A.numeric_col_indexes)!=len(G.numeric_col_indexes):D.error=f"Number Float columns indexes are different: {len(A.numeric_col_indexes)} != {len(G.numeric_col_indexes)}";return
-	F=[''for A in range(A.cols_count)];K=_A;H=_A
-	if C and C.type==ReaderCurveParserNameConfig.COL_X:L=C.info[_D];K=A.data[L];H=A.names[L]
+	R='Errors limit reached';F=reader_ref;E=compare_floats;D=cols_curve;C=group;A=reader_test;logging.debug(f"compare cols: {C.name}")
+	if F.names!=A.names:C.error=f"Columns of datasets are different : {F.names} {A.names}";return
+	if len(A.numeric_col_indexes)!=len(F.numeric_col_indexes):C.error=f"Number Float columns indexes are different: {len(A.numeric_col_indexes)} != {len(F.numeric_col_indexes)}";return
+	G=[''for A in range(A.cols_count)];K=_A;H=_A
+	if D and D.type==ReaderCurveParserNameConfig.COL_X:L=D.info[_D];K=A.data[L];H=A.names[L]
 	M=False
 	for B in range(A.cols_count):
 		if B not in A.numeric_col_indexes:continue
-		S=A.data[B];T=G.data[B];I=A.names[B];logging.debug(f"compare vector colum: {I}");N=E.thresholds.vectors
+		S=A.data[B];T=F.data[B];I=A.names[B];logging.debug(f"compare vector colum: {I}");N=E.thresholds.vectors
 		if E.thresholds.vectors_columns and I in E.thresholds.vectors_columns:N=E.thresholds.vectors_columns[I]
-		O,U,W=E.add_group_and_compare_vectors(A.names[B],D,{'info_prefix':H}if H else _A,N,S,T,info_vector=K)
-		if U:M=True;F[B]=R;continue
-		if O.total_errors>0:F[B]=f"{O.total_errors} comparison errors"
-	if C:
-		for P in C.curves[_E]:
+		O,U,W=E.add_group_and_compare_vectors(A.names[B],C,{'info_prefix':H}if H else _A,N,S,T,info_vector=K)
+		if U:M=True;G[B]=R;continue
+		if O.total_errors>0:G[B]=f"{O.total_errors} comparison errors"
+	if D:
+		for P in D.curves[_E]:
 			Q=0
 			for V in P[_B]:
-				J=C.curves[_B][V]
-				if F[J[_C]]:J['comparison_error']=F[J[_C]];Q+=1
+				J=D.curves[_B][V]
+				if G[J[_C]]:J['comparison_error']=G[J[_C]];Q+=1
 			P['comparison']={'curves_nb_with_error':Q}
-	D.error=R if M else _A;D.info={'cols_has_error':F}
+	C.error=R if M else _A;C.info={'cols_has_error':G}

{scilens-0.5.3.dist-info → scilens-0.5.4.dist-info}/METADATA

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

{scilens-0.5.3.dist-info → scilens-0.5.4.dist-info}/RECORD

@@ -51,7 +51,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=6F39F7ZjfyTl-Vh57ZLiyHPVMIPPiNdZQ3_KKw1QGpE,4233
+scilens/readers/cols_dataset.py,sha256=KC0EEJaVlMjXH7H7irgWa80tcKcGXsmZSrQVdjtNcGE,4328
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
 scilens/readers/reader_csv.py,sha256=ISEjLjMFcRziryZTYyH-Jg4vOtgPVwAH1kgfEQBHVAA,5619
@@ -122,7 +122,7 @@ scilens/utils/time_tracker.py,sha256=DdVBoMpVLXrX0qZZXyLm4g38EwDVLlRcBqcpNex1mYY
 scilens/utils/vectors.py,sha256=4N2BZSC5n3HgZqPujDGF5NdjVmSL1rOHb_qw4OoABQY,103
 scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
 scilens/utils/xml.py,sha256=HcB-ymJy8o4lsczHpXznGrbYahq_3cnnkPOdRfWdHfg,461
-scilens-0.5.3.dist-info/METADATA,sha256=o7eu816V4IYfq-KJH6Z8kj1JQ_NfLGlCVvQ0xBCt5PA,1405
-scilens-0.5.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.5.3.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.5.3.dist-info/RECORD,,
+scilens-0.5.4.dist-info/METADATA,sha256=fEncH81h03c7n54j7NjsLy8ujvqsEWFxXrZBXyeuNz4,1405
+scilens-0.5.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.5.4.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.5.4.dist-info/RECORD,,