From 85b4335cfcc92e93ad449a3c71b0f8544637e7e4 Mon Sep 17 00:00:00 2001
From: Cristian Pozo Gonzalez <cristianp@correo.ugr.es>
Date: Thu, 10 Oct 2024 13:17:13 +0200
Subject: [PATCH] Change the tests. To implement the np.asset_almots_equal
 function, to compare the numpy arrays.

---
 ptiming_ana/phaseogram/pulsar_analysis.py     |   2 +-
 tests/files/fit_result_tutorial.pkl           | Bin 910 -> 0 bytes
 tests/files/peak_statistics_tutorial.pkl      | Bin 1111 -> 0 bytes
 .../files/periodicity_statistics_tutorial.pkl | Bin 798 -> 0 bytes
 tests/test_tutorial.py                        |  52 ++++++++++++++----
 5 files changed, 43 insertions(+), 11 deletions(-)
 delete mode 100644 tests/files/fit_result_tutorial.pkl
 delete mode 100644 tests/files/peak_statistics_tutorial.pkl
 delete mode 100644 tests/files/periodicity_statistics_tutorial.pkl

diff --git a/ptiming_ana/phaseogram/pulsar_analysis.py b/ptiming_ana/phaseogram/pulsar_analysis.py
index 070b579..8fc392a 100644
--- a/ptiming_ana/phaseogram/pulsar_analysis.py
+++ b/ptiming_ana/phaseogram/pulsar_analysis.py
@@ -297,7 +297,7 @@ def set_config(self, configuration_file):
             P3_limits=conf["phase_regions"]["P3"],
         )
 
-        if conf["phase_binning"]["custom_binning"]:
+        if not conf["phase_binning"]["custom_binning"]:
             self.setBinning(
                 conf["phase_binning"]["nbins"],
                 xmin=conf["phase_binning"]["xmin"],
diff --git a/tests/files/fit_result_tutorial.pkl b/tests/files/fit_result_tutorial.pkl
deleted file mode 100644
index fbfbdf608e39df275ddbc7c743fd9038103fb6b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 910
zcmZuwOKTKC5Z<R7jToXPMumWqm_%_EPacFBlPJU?tK<+&APhaTy*oqZWp@uTU_=p<
z4K!Z1e4sxdB6t!!3Ld<OkCSHw!J{FEh&Qe7HL?+Vn4aqC`l`Nq-74O{lh5cSyAu*s
z2`{@bqvaYSAqBZ}oCtDJ%S{-$4NEXA3wBs%Ap6_Z{YX$2k${&&5|KJ(9OUlNAa>^`
zTW4s3?EQnV1K;80zYvgJb{ZwVJ0DQnQ5dD%6QyCY*di0Af$#}qWD%{}jJk2e1xsC_
z6pLCBWC_V@l_pr3yD*k@U<IaN*vjHlS_ZF67OP@0p$e3{d=^$4t^2&p-hfJ_a_JW?
zy;+6;XLSx^&4np?;C?+MAPZq?pFv0ZsHE(9d`Iye1BwXQ;iNt?jkv-DzN=hW8AU*O
zvT|zoI_2KB&`_kzcR_aAH5P|XTB}ipu;B+ut1OvsMk>F*UN@pgLz~U@$HtTQUyj@?
z{xBvRC%sRHo*7zgXvusx^Yin=l5h6E+GvaqIOg+4@5_5nXAHBj_GV-MRpagE$5R6x
z%=kKZy7}V7wH6M+YsXjO*$;yzpNNl6_Z&09>yx?Kw)C9)Cp{Sq*2?Lm4hj|12*#Li
zk8&AQ_WHKBNR?ivyzCH;jkU{;=z={F;XjPlGi7m0)-6`WwgYdE*R4wF?b|A39uJ3g
zVG0%9pT%hsq-d^qfw7pis!)j3RV7_k%tqzG|B+xMsw);#>f7eoyHdf@3Bm*xP8PU`
z6R=83peSUuO{xsz6kspmfGDP0!(xY25KVm!DG?!X43<FduxkOSYw-XHf_Q=3)ilBW
QAcEQfacIDy!BeOF8=mNCT>t<8

diff --git a/tests/files/peak_statistics_tutorial.pkl b/tests/files/peak_statistics_tutorial.pkl
deleted file mode 100644
index 44509aec8fad2e37333c3f5af16f4c4d97914b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1111
zcmZ`&T}V_x6y9Ce)HM4cQzN7(!Av$X5S64cOU<j>QudG`!`$7udoSI+yWJnkGO!|3
z8T!G|zzQTHdy%4&f}kJRx9F|NC+Q^;dkDe@sRuiAZ<bcxhnX{X&N<(A&U~jQbEq}w
zb3e8=MT{7+LeZp2LyAcfl(U@u#3qfdJ;=A8=jV7C3*toF<g8?|yJpzbG>C4662u^J
zYFeD-?bDOd6K&p^4?^UIUm;l6WGnPLhO^b!F;ZIegif(6g20=tGn_=K%VPs3HMJ;b
zxmYoi3E5E;YKoM@)gF1@S-t4}Wa)7<{WUhRr|Bu0AG%RqoPQL#*EP@4i=N5$jaROs
zkHOMnr>+~lX>6G;J{d=xWx6=9$Ly{Y703aln)mlz=7)Kil)?OacsLwxnTO9^B%jS?
z$uDK~a^`Q~Hn_2D+0k@cGob2BOV^?zjpPF-zsMp5#H!}1`G5F+%5JUx;A=zQ2Oi7~
z%-lt}BlRO=8xMJWE5^~PnbG{23)fJKcIL^|9R^BIq{rrl+Ywg_JZ!aCAgd*C3M>!v
zthIUT&4J_SQO8tK{nRUT<!xd4x3e8COwZ>usv7FO^<&#8x;;Ewao}Dzs`*@ao4tg#
z`~wq^GM0zIwN+c1#w*anIVfl3I-1{7xhWWF_o`X{7~Q{Ed;em`IKp3sX79XfLrv4^
z*4L!+KQI|ma50R{J3%)^OQja0r>PZ^i3I{(i4A%RA2i?}^jxiDnG3cn)fmW^vw}rZ
zN;vRP#5744C={DCnlvoibfUHhU&FFs1l&vUfR}iKU*?_={8I1|SJ$z?p(Wzz{!1Kt
zK^*;pb0D${loY81MMQS(5PKl9n^U-EK|{<|*y$AyxL2(QrfP%Qs5T2kwPgV>3l0%C
zSKbjVZfJ@YB?d@~WrU$vmIEuMrkR9UToHB>GE4-dPAUo%W<db9u}N$#39i;oW3y)q
z0_rgjn+gIj&Y*kn5v^L7dYqs(aeLPZ{E2PDJf8y?tmq`}nuSEylcy{kb5fvpVpFUW
Mnd%nrvm80}6ONIug#Z8m

diff --git a/tests/files/periodicity_statistics_tutorial.pkl b/tests/files/periodicity_statistics_tutorial.pkl
deleted file mode 100644
index 8d93367d3a746d49b9b716590e7b1d3b2e03b445..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 798
zcmZWn%W4!s6rD#VV~h|TQL|C9h&Vygh^s6FgCi1c(t>UzF%;E3)zeL?t2^~D4kW0H
zi3!v$*L;OvA^wE=58?+1daHXP6H|+-Q&snQ&VAqdbhTM4m%UO@(WlCba>=|{(u{$f
zc}z8ZQsQG+`T+aTwNoS;NU*mi%~PS76qGA3qk;~YRA4VX;(4^aUftms?Deq+;c2M6
ze=cC>h!I5^ZF5FK=i`h!!eqs;Dh45wX#{qb#4^u96UR)VQTJr6s=YS<`Q*#ytM9Ah
z>-hNf?)UoFo3r7!bMHSl_u3mfKhC{_ZIyZP?CW8{TqTWo1&$6s!VBp7O<R8eK@dFq
zgR9*9nugGC`ppBd^&V(6vll{>a-9k!p`~~lxiEeWjp{Cn-*Ec~wvfyDvn2M}Tc*5_
zDy04*5p0({75Ikk$!*&@#ia;+6b9_I36?U0IjNL%h};v&qFg8~O{AUsW!pw^%THI!
z2zvDps-Eh8a|B7pHlCm9bML=CA7Y<JuI9O3k`lFJsANPlrNOp0#28JlRe+(fof2+_
z0&{@vCU=r0tUI}zc*#ANKe<1deWi>%^HNitD($3h7t3!bH%LS$Fj>gtLLM(HzE<fV
zql@6;C#zLx=Hla2qFy+#j+fKnB^lGSBx(zlpjzWt?t`5sF{gtP-k_Z4yNdKpfjUvm
N2&W<A3J#SCy}$dkGEx8l

diff --git a/tests/test_tutorial.py b/tests/test_tutorial.py
index 10a8591..39f0929 100644
--- a/tests/test_tutorial.py
+++ b/tests/test_tutorial.py
@@ -1,7 +1,6 @@
 import unittest
 from ptiming_ana.phaseogram import PulsarAnalysis
 from astropy.io import fits
-import pandas as pd
 import numpy as np
 
 
@@ -34,7 +33,7 @@ def test_load_config_file(self):
         h.setListsInput(phases, times, energies / 1e6, tel="fermi", energy_units="TeV")
         h.get_results = False
 
-        self.assertEquals(h_config_from_file, h)
+        self.assertEqual(h_config_from_file, h)
 
     def test_run_analysis_phaseogram(self):
         h = PulsarAnalysis()
@@ -42,23 +41,56 @@ def test_run_analysis_phaseogram(self):
         h.run()
         results = h.show_Presults()
 
-        expected_result = (
-            pd.read_pickle("tests/files/peak_statistics_tutorial.pkl"),
-            pd.read_pickle("tests/files/periodicity_statistics_tutorial.pkl"),
+        peak_stadistics_data_expec = np.array(
+            [
+                [108.5913594, 58.00656799, 110.16571886, 14.3384333],
+                [5959.23714286, 2677.27142857, 8636.50857143, 1126.74285714],
+                [84.22028603, 62.20823982, 105.93665554, 81.25025086],
+                [6969.0, 3734.0, 10703.0, 4884.0],
+                [1009.76285714, 1056.72857143, 2066.49142857, 3757.25714286],
+                [451.84108843, 241.36129211, 458.39188858, 59.661223],
+                [187.53441252, 82.35892672, 189.98591475, 18.38185577],
+            ]
         )
 
-        pd.testing.assert_frame_equal(results[0], expected_result[0])
-        pd.testing.assert_frame_equal(results[1], expected_result[1])
+        periodicity_statistics_data_expec = np.array(
+            [
+                [26977.43375174, 25992.17369182, 28101.4067069],
+                [0.0, 0.0, 0.0],
+                [np.inf, np.inf, np.inf],
+            ]
+        )
+
+        np.testing.assert_almost_equal(
+            results[0].to_numpy(), peak_stadistics_data_expec, decimal=5
+        )
+        np.testing.assert_almost_equal(
+            results[1].to_numpy(), periodicity_statistics_data_expec, decimal=5
+        )
 
     def test_run_analysis_fitting(self):
         h = PulsarAnalysis()
         h.set_config("tests/files/config_test.yaml")
         h.run()
 
-        self.assertEquals(h.fit_model, "dgaussian")
+        self.assertEqual(h.fit_model, "dgaussian")
         results = h.show_fit_results()
-        expected_result = pd.read_pickle("tests/files/fit_result_tutorial.pkl")
-        pd.testing.assert_frame_equal(results, expected_result)
+
+        fit_result_expected = np.array(
+            [
+                [0.9924233191795764, 0.0015660661377770266],
+                [0.026304542387059753, 0.0014698372893777872],
+                [1.3763409922947634, 0.004402295450743174],
+                [0.0509859742803803, 0.004192067589437329],
+                [466.4375, 0.0],
+                [200.23728941446313, 10.903033719301062],
+                [145.13336608138428, 11.04167277916415],
+            ]
+        )
+
+        np.testing.assert_almost_equal(
+            results.to_numpy()[:, 1:], fit_result_expected, decimal=5
+        )
 
 
 if __name__ == "__main__":