From 66f4a1ab4684eea6473558eb6ee14fd49dc5889e Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Mon, 4 Nov 2019 08:41:38 -0500
Subject: [PATCH] Corrected image generation

---
 data/Plausible.hdf5                             | Bin 11592 -> 0 bytes
 data/Plausible0.hdf5                            | Bin 9348 -> 0 bytes
 data/Plausible1.hdf5                            | Bin 9348 -> 0 bytes
 .../result_analysis.py                          |   8 +++++---
 .../utils/get_multiview_db.py                   |  14 +++++++-------
 5 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 data/Plausible.hdf5
 delete mode 100644 data/Plausible0.hdf5
 delete mode 100644 data/Plausible1.hdf5

diff --git a/data/Plausible.hdf5 b/data/Plausible.hdf5
deleted file mode 100644
index 4f10a2ad8f524e8692771be0ab2f3f3709f37c16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11592
zcmeD5aB<`1lHy_j0S*oZ76t(j3y%Lofrl<c2+I8r;W02IKpBisx&unDV1h6h89<PM
zK?1^M5QLhKt}Z0V)s=yPkpX5tjD~7sFkpeOVCF!0qvS{l0S{Nl0FYlJKm-E=g9Vg6
z0ZnI6E<;#mYPkUe1DH01(nbsn3_giTsX4_A48Ex)i7AOCi7@rBbgKXpK%*HMxER1{
zzyv6TYJgQRGC>4Vz&r*9NCskHK<6_v2!Qp2auq}e2UrIy0|!`~i3ws52Q-H;GcrIF
zFuY&}D})k4P+^c6e>x|}@-R3sfU*Q511p0F0|!H1Vs0u(sU#yKIESIz2hs<U=VoAF
zcmX09Kz?Ch5CE%YV5ndP$uck$Kqv-~44jF?2=?=L0oe%)F9k&;Ni0lAXfZHYutOwa
z?ubx=@DrfoP){=`p!gc12AKr;3&ei`buWmG4a3Tb3-Z`x2VRVa!2=q9><nrQ91O(;
ziABY!3=9%X(0Jj1&<qS53~r7-!LAGp3?V_GAPOu23rB=cU_M5OAhSTp3Z%yYM1bQS
z5;L?*$1kKI_R~HcgNgw9hbJ32|H48Yo{v-@zJ36q7|_ctSUPWjrhBL|uvs8BxR3)e
zh7o3j1L}ARZX7f%gG_~q!2=SM#vy_X5DG$q)Y1<#!tKUpCw^IMI;bNC4GBg@r0_$S
z43UMBaQ8#`gea(bD21#VLkJ`Q!pMrqWn;LW0oiZ(O@+7tLc&yHGY=+*NrUx*35XmL
z6CwZ#X*dhS0I9&R10;czB*0vdPPjst2syO7v%e2Gx}g;)n9abz0Bs6@+e?0>xk;%-
zpw<%u1E@>|S&S(UYE>~Xz^Z9Xc~EPM0bI9%^s|8or1lq-%TU1&V~x_IAut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UoY`0Y>P^0_OM_uCWMe*$guWF=_!58R|4P
zA7K-twm*rr14$h$`Vm4{S)jClMFJ{}@COz(;PeGm2$lx15jqeouq0Ljqys|&s~}Vr
zb~%)>Kb-bL^+GAAfuv9jC|XfC#Esg4+=*r(hABw$C~_zqBt?w$pXa%t4hdu0&+~xB
z9O*yL1DU7QfDV{4Lg#5=Q4E{!h0)9m65t|MP(dC#2CBdy&cPsF4+$g&-1ELWv>{3+
zKy8BXgs3#{3mS)o&HIApjd>U>!0uyYU}FHyJ%i?tiy0Uggc%`YyD<O3#(`n9Up_-*
zDo7zT93Za5Bq8fL7;vuVz|=7+GLk|7whjn=9RLr50W@8*Gw^`cH6(#nbTBXoaDZmQ
zK_TP-BEWeJ!~m5EAR3{M1FFwCC$YE~r#@JEM&tuNus+b*kmA%5pVYkck_^x)2psmp
z@;k0|5+FB?;?WQo3?YDMAK-TlvFh-fLb@!%UMLIHG9uX+s9spbMUsAqUQnZoByB_}
zhL{W@iBL?j5|BNZ800T-^BhwOE&^5q=fM~VQH0ZAau6D#0zyJWFiC_gvMC5rOdX&|
z#3~9F#IF<C4zO}00!1gBgRBECh@=a|#3_!@3}=DVqhsv)v5TVXg>>FPYC#wx3%6{@
MGaBp}7=}Iu03+ko!vFvP

diff --git a/data/Plausible0.hdf5 b/data/Plausible0.hdf5
deleted file mode 100644
index c7e0dd9d3a42182c5879b66d3ac225656171d2e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9348
zcmeD5aB<`1lHy_j0S*oZ76t(j3y%LoL5m7R2+I8r;W02IKpBisx&unDV1h6h89<PM
zK?1^M5QLhKt}Z0V)s=yPkpX5tjD~7suwa3(3?S4fIl@A~!__eW<mCtu!N9;^0i{ns
z(;1Y@;FFk?np4cc;G0^Kn37nM2on#>Of3hc9T08Ez`y{ajTk^F4x&N<LSc}M4D1Y`
zw9Nq`!0I6>nUN79paj(cqnQ~b!0H7R<QX7IR)ImBgF(C=s*aU`11!(P!~`~g1DZ3K
z85uYrN?<ty!V`iDgB0)Jsfy)cZ~&Xj$iT`V!ob0hmzbLhQYp#E2+moc+zV36fTRy3
z&&I&O&;hjpB+tWO0X2t>0ptddImHYN48n{I49p;ZLj4B|UKs6{&k&hf%)k)r=kEe?
z1Jp<c1&}6?ML00XU0^9mFbNI=5UYU|L^3dRK!TM477sU|>L9Y1qy|)oLmJA!L4o2N
zBxNB3A_pIalzR*~%e}$p;!zikh5&j9G}tpRP=?)|{e3{?61Wfpl|N7`K;;&Q2`krO
z<q$VW5L%A=mF6a;7C~}4tQf+S2bKB^;4%-S6;mEm8-QdWxPl)-kCLMyFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0@Mou^zmKTxZ(=vxFF0X@E8FD0|R(47$!&o
z&B(w49*aByH3K$3fj%zD!(ad&I{=Lb^MJ-(lRzWL3=9Gsu#r{=un92t!NwsF`ZyRM
z`kZqTi;HpUgN<(>#%KA!`aomZ#i=Desd?!o84S4Xg^fdl+zE1v0*C;Qr$9zb86m^Y
z3@~+&i5~_GJ~M*=I9x#Ewh$vAF@k&ix&u0N8v;=d4h;qdYK>om#%o~X*Pt-sVeo**
zhZ+M1LvcZ3QE@5*g9H;~Odk|45QlIuxH<X+yD~5^gan0xD6j&E9MqBE@PUl;(=WX4
zC_-$feRzS=;?NH-17&)J7iivw+TjIp`zSdY0;3^7?GRuDO~!%<^g^9Xi@-*K32X+y
zEd#4yWMqKSPzuZi6QG3;$cn*&U;;X~3NamG08|`e2t)!(LWH0siZZAeoB}PifS3jm
zf*L?I3T!Ia1*98^2ncL?!6u^yCCDBIR3T8XK~;h&gnt=8sxcIU6d`N_@j#&iQ3~dP
z2{0c_fVs$N2&5cgDp(D|Jp3#qZFm(z>;#c`m60I{aXiEwV5ftk0AUWuN~jW0FoRWq
m36KOdJP}NATM(uhBn-w#%D{XO0XGB6LGYn0P-BY`MJE7vudLJn

diff --git a/data/Plausible1.hdf5 b/data/Plausible1.hdf5
deleted file mode 100644
index c7e0dd9d3a42182c5879b66d3ac225656171d2e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9348
zcmeD5aB<`1lHy_j0S*oZ76t(j3y%LoL5m7R2+I8r;W02IKpBisx&unDV1h6h89<PM
zK?1^M5QLhKt}Z0V)s=yPkpX5tjD~7suwa3(3?S4fIl@A~!__eW<mCtu!N9;^0i{ns
z(;1Y@;FFk?np4cc;G0^Kn37nM2on#>Of3hc9T08Ez`y{ajTk^F4x&N<LSc}M4D1Y`
zw9Nq`!0I6>nUN79paj(cqnQ~b!0H7R<QX7IR)ImBgF(C=s*aU`11!(P!~`~g1DZ3K
z85uYrN?<ty!V`iDgB0)Jsfy)cZ~&Xj$iT`V!ob0hmzbLhQYp#E2+moc+zV36fTRy3
z&&I&O&;hjpB+tWO0X2t>0ptddImHYN48n{I49p;ZLj4B|UKs6{&k&hf%)k)r=kEe?
z1Jp<c1&}6?ML00XU0^9mFbNI=5UYU|L^3dRK!TM477sU|>L9Y1qy|)oLmJA!L4o2N
zBxNB3A_pIalzR*~%e}$p;!zikh5&j9G}tpRP=?)|{e3{?61Wfpl|N7`K;;&Q2`krO
z<q$VW5L%A=mF6a;7C~}4tQf+S2bKB^;4%-S6;mEm8-QdWxPl)-kCLMyFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0@Mou^zmKTxZ(=vxFF0X@E8FD0|R(47$!&o
z&B(w49*aByH3K$3fj%zD!(ad&I{=Lb^MJ-(lRzWL3=9Gsu#r{=un92t!NwsF`ZyRM
z`kZqTi;HpUgN<(>#%KA!`aomZ#i=Desd?!o84S4Xg^fdl+zE1v0*C;Qr$9zb86m^Y
z3@~+&i5~_GJ~M*=I9x#Ewh$vAF@k&ix&u0N8v;=d4h;qdYK>om#%o~X*Pt-sVeo**
zhZ+M1LvcZ3QE@5*g9H;~Odk|45QlIuxH<X+yD~5^gan0xD6j&E9MqBE@PUl;(=WX4
zC_-$feRzS=;?NH-17&)J7iivw+TjIp`zSdY0;3^7?GRuDO~!%<^g^9Xi@-*K32X+y
zEd#4yWMqKSPzuZi6QG3;$cn*&U;;X~3NamG08|`e2t)!(LWH0siZZAeoB}PifS3jm
zf*L?I3T!Ia1*98^2ncL?!6u^yCCDBIR3T8XK~;h&gnt=8sxcIU6d`N_@j#&iQ3~dP
z2{0c_fVs$N2&5cgDp(D|Jp3#qZFm(z>;#c`m60I{aXiEwV5ftk0AUWuN~jW0FoRWq
m36KOdJP}NATM(uhBn-w#%D{XO0XGB6LGYn0P-BY`MJE7vudLJn

diff --git a/multiview_platform/mono_multi_view_classifiers/result_analysis.py b/multiview_platform/mono_multi_view_classifiers/result_analysis.py
index a94f8e1e..d99e6514 100644
--- a/multiview_platform/mono_multi_view_classifiers/result_analysis.py
+++ b/multiview_platform/mono_multi_view_classifiers/result_analysis.py
@@ -415,10 +415,11 @@ def publish2Dplot(data, classifiers_names, nbClassifiers, nbExamples, nbCopies,
     """
     figWidth = max(nbClassifiers / width_denominator, minSize)
     figHeight = max(nbExamples / height_denominator, minSize)
+    print(figHeight, figWidth, nbClassifiers, nbExamples)
     figKW = {"figsize": (figWidth, figHeight)}
-    fig, ax = plt.subplots(nrows=1, ncols=1, **figKW)
+    fig, ax = plt.subplots(nrows=1, ncols=1,)# **figKW)
     cmap, norm = iterCmap(stats_iter)
-    cax = plt.imshow(data, interpolation='none', cmap=cmap, norm=norm,
+    cax = plt.imshow(data, cmap=cmap, norm=norm,
                      aspect='auto')
     plt.title('Errors depending on the classifier')
     ticks = np.arange(nbCopies / 2 - 0.5, nbClassifiers * nbCopies, nbCopies)
@@ -426,7 +427,8 @@ def publish2Dplot(data, classifiers_names, nbClassifiers, nbExamples, nbCopies,
     plt.xticks(ticks, labels, rotation="vertical")
     cbar = fig.colorbar(cax, ticks=[-100 * stats_iter / 2, 0, stats_iter])
     cbar.ax.set_yticklabels(['Unseen', 'Always Wrong', 'Always Right'])
-    fig.tight_layout()
+    # fig.tight_layout()
+
     fig.savefig(fileName + "error_analysis_2D.png", bbox_inches="tight", transparent=True)
     plt.close()
 
diff --git a/multiview_platform/mono_multi_view_classifiers/utils/get_multiview_db.py b/multiview_platform/mono_multi_view_classifiers/utils/get_multiview_db.py
index a3f2e1d1..3116890b 100644
--- a/multiview_platform/mono_multi_view_classifiers/utils/get_multiview_db.py
+++ b/multiview_platform/mono_multi_view_classifiers/utils/get_multiview_db.py
@@ -36,13 +36,13 @@ def get_plausible_db_hdf5(features, path, file_name, nb_class=3,
                           label_names=["No".encode(), "Yes".encode(),
                                      "Maybe".encode()],
                           random_state=None, full=True, add_noise=False,
-                          noise_std=0.15, nb_view=3, nb_examples=100,
+                          noise_std=0.15, nb_view=3, nb_examples=5000,
                           nb_features=10):
     """Used to generate a plausible dataset to test the algorithms"""
 
-    if not os.path.exists(os.path.dirname(path + "Plausible.hdf5")):
+    if not os.path.exists(os.path.dirname(path + "plausible.hdf5")):
         try:
-            os.makedirs(os.path.dirname(path + "Plausible.hdf5"))
+            os.makedirs(os.path.dirname(path + "plausible.hdf5"))
         except OSError as exc:
             if exc.errno != errno.EEXIST:
                 raise
@@ -76,10 +76,10 @@ def get_plausible_db_hdf5(features, path, file_name, nb_class=3,
 
         dataset = Dataset(views=views, labels=labels,
                               labels_names=label_names, view_names=view_names,
-                              are_sparse=are_sparse, file_name="Plausible.hdf5",
+                              are_sparse=are_sparse, file_name="plausible.hdf5",
                               path=path)
         labels_dictionary = {0: "No", 1: "Yes"}
-        return dataset, labels_dictionary, "Plausible"
+        return dataset, labels_dictionary, "plausible"
     elif nb_class >= 3:
         firstBound = int(nb_examples / 3)
         rest = nb_examples - 2 * int(nb_examples / 3)
@@ -115,10 +115,10 @@ def get_plausible_db_hdf5(features, path, file_name, nb_class=3,
         dataset = Dataset(views=views, labels=labels,
                               labels_names=label_names, view_names=view_names,
                               are_sparse=are_sparse,
-                              file_name="Plausible.hdf5",
+                              file_name="plausible.hdf5",
                               path=path)
         labels_dictionary = {0: "No", 1: "Yes", 2: "Maybe"}
-        return dataset, labels_dictionary, "Plausible"
+        return dataset, labels_dictionary, "plausible"
 
 
 class DatasetError(Exception):
-- 
GitLab