From a2fb21264fb422574d6bf57af2afa10d1101d8a8 Mon Sep 17 00:00:00 2001
From: Angelos Chatzimparmpas <angelos.chatzimparmpas@gmail.com>
Date: Tue, 12 Nov 2019 09:33:16 +0100
Subject: [PATCH] fixed metrics

Former-commit-id: 5d8d48fbf9c9f60965e044dea6d7db1cef722f4e
---
 __pycache__/tsneGrid.cpython-37.pyc | Bin 9972 -> 9920 bytes
 data/iris.csv                       |   2 +-
 js/tsne_vis.js                      |  10 ++++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/__pycache__/tsneGrid.cpython-37.pyc b/__pycache__/tsneGrid.cpython-37.pyc
index dd0b69cb7d5bd88d5217982687b5c5518b21495f..8d9bc74062240cea1fee59ebc1c62484d08b073b 100644
GIT binary patch
delta 1208
zcmZ{jOK1~e5XX1&YHYIU*5;k8iEWGq73vc)ReV$}w2j4DTeVSQQ%W>x;+OSNO?_2R
z4{CKlyhyDmE#gH2f>_jx(3_};P!t4jUc7h^Jm}0u0zH^zfAjx;Gklx<X7*?2>rQ!_
zEZ0i(d#B7M^H1e3wY{z6G^r#Vg)vCOF_Z9XhNH&&rjj%Xqnv?iX6?TWPzE&feM^b5
zlZLdxCv{6PV?r#Wy#x?qHP~m%Df*+p0e1Zs3H)Tc2^~0OKc-%%s^UU|1hrt*ZzgNe
zgFoyS>h5xd>0gEDE1#1$0o=nGM+o}MpB<|K_G6tAhC|q_Y&RdE!Y6oIQQ<)Oj`G+H
z8*!`qvN=!7aa`<aL5s(&yB2bLA&;tO3qJGs^|j6T(bJ;zP_6JV7BD(-vDfA5U|GZ1
zPna|2QU%e6?cOl-W7fOQb(m8-8EuSqMgpICms<9)+*|(UO&V4fSr0Q#Ff@i>L<w{9
zKq@<MBAe0%cZp2;1?B=D-~nz8cELfs9gNb6Jr5@8+v#A77OI!54lsdugkCjbvywN`
zU3408Mrp*18n>CW8qGQety1zAK2;~60sp9B99<Oec3!0}kJf4~J=!$qRTFtTd5$u9
ziK2r%$2#&xiVAs-_2dl{7n0}LFeIhiXbYVRxoH-hC0EH^@|3(o=1Bl)9FD*2l{Am$
z)qFS^@|i2@RaJeds^3-R3kP=kH9zg<<2`icuc|;*1*=MBmA2FT$q8|U4nhnt()iZB
z-c>pBCA`1~EqEGk;G6I&OM&h2N|D}(`9(KrNa8M`w{3oAypqv7I6rfXGs#MW=Vxwn
z=jefwI7x^F1UF2aVw`4-FwQW}GI-F$d4|epW-MnM#`BFU{1;hXVni5YjCG6-eBZd#
zsgK<i@^hwaK3@>mNTRiAWCQ=Fn7Q&!{~g8p-32X^%bXeP9?T97Xqo(QFTQLF+nwNt
z6?8=*YQ*nNJ75Z%BW>^yM<Uzg34T8VZ7-R{ba^(?3JqOk<}4yLoX+PeueJ|E(KWFI
ftqc7_>tof=;7?aPU_4?>F{bfsGz~TQHR}8ev1Jdm

delta 1400
zcmZvcO>7%Q6vyYSckPY68#``oufM8%)rmzSl~z3^<)frD64)sO(l)`gme;M4Cb2V~
zPy%bE!a<3Upn*Y192y)dsuskdvcv&Z2#E_q+>ns4#ElzQ#04aHZ(~J9!q)!g{ojA|
zc6R5@ew+IvXPz}pKf~Wx@cY7@hvu*T)eEQu6X380Gys@T9Jb_XfDJcPo)PMj*7Q1T
zAL``5q4QM70dzq4n!3Xr*jH>N&SqKGljoyYmjfc(!=pH~Rk2Ym%clb?VFM)t1A03b
zpON1LZbMGyjT`Wu{Mtyuoc!6i75o_I)l_%3ANb`~**pUSdz7S#3{>#DR|pFkN*D|3
z3NN(2>pclDFaHeo!xb3|J)<q)<S*rwP#P9m_0Z=UOvusbmR7~|q<k2C(T&bvG%2TI
zmaCqS#n_x1Jt-f>CKu*#E{_p<2zkW3R<##vf?Je`6LJI}VII-;tQ4#KGRXu<t+ZUJ
zmD}o4WpR}!DV-t|<g9f%a+Sho3Dbn<2s84IHR7G6@a5JIRzVpT6junZ5!MMcLI%+`
zOU32V`f^c}&+|q5k$frn6Wo=fsSEIm+(>2c1vgXqzUOgMYF?br^j>^>{GR+LHSDLS
z^59h)l;i1F&9LwZy#Z5f7YeHUDE-O!QQ>b!M92Y~+3aoQ8gBGHxVb*Z6UWW(&da%D
z6SL7BY^b_l#N06;qB|;T12v5%YHYcBFKQZtsIl$pA=EVXp;mAVqo(o5byl?GZ^v$K
zTG)_Born{4VvcoP+sCHeg|#0qG7%REk)*pdU>mN1t=ig_ZhLLtyPkTy<Kn&1RngVE
z+(gH955YD=x2MZZc3fOn12(rkX#2bDRL90;Vrd24K$n}wg{MRc7agaix>4dVN*+e3
z!zfLWZQwaF^Sp$c!fiqsQ359I=!wWd6C9^BZ9S(}zAg9qAMaTs$q}*`JtY?gLT(f9
zVslT(FFNXdSN+vdACM{>bku(<N@^7>#rRD`HqEI+`0IoX!W)D)2@Zjpp5G#*2`31T
z5w6NhgJUBz7|wfZYwJZ`=5JBHK^P`%5l$0wa&K@X=r;Wh>bAOEsZ`}JgBt^%l1&TD
zYW#l>f?OR+!X^36P`?p{1dQQ7qnuRaS3~FEzWjS=8a|WfhR>Q!dMpJCF^xZHeK<S?
zM_xeD_VVJYU0FGJqKoqP<EOH;X6~MS_Z$~U($|FFCEO$2Cp?hnGj>GR1G=UM^`N!M
M`oe}a9rpR*Umo&1*Z=?k

diff --git a/data/iris.csv b/data/iris.csv
index 0862df1..7456e9f 100755
--- a/data/iris.csv
+++ b/data/iris.csv
@@ -1,4 +1,4 @@
-"sepal_l","sepal_w","petal_l","petal_w","Species*"
+"sepal_length","sepal_width","petal_length","petal_width","Species*"
 5.1,3.5,1.4,0.2,Iris-setosa
 4.9,3.0,1.4,0.2,Iris-setosa
 4.7,3.2,1.3,0.2,Iris-setosa
diff --git a/js/tsne_vis.js b/js/tsne_vis.js
index 4e9409a..cd4d0ce 100755
--- a/js/tsne_vis.js
+++ b/js/tsne_vis.js
@@ -197,9 +197,13 @@ function ReSort(flagInitialize) {
 } else {
   labelsTarget = uniqueTarget
 }
-
+if(flagInitialize) {
+  var optionMetricOver = document.getElementById("param-SortMOver-view").value; // Get the threshold value with which the user set's the boundaries of the schema investigation
+  $('#param-SortM-view').val(optionMetricOver).change();
+}
 
 var optionMetric = document.getElementById("param-SortM-view").value; // Get the threshold value with which the user set's the boundaries of the schema investigation
+
 var order = [];
 SelectedProjections = []
 
@@ -5279,6 +5283,7 @@ if (points.length) { // If points exist (at least 1 point)
                 //if (m == j){
                   Object.assign(data,{[Object.keys(dataFeatures[selectedPoints[i].id])[indices[m]]]:parseFloat(Object.values(dataFeatures[selectedPoints[i].id])[indices[m]]).toFixed(1)}); // Push the values into the pcp
                   //Object.assign(data,{[Object.keys(dataFeatures[selectedPoints[i].id])[m]]:parseFloat(Object.values(dataFeatures[selectedPoints[i].id])[m]).toFixed(1)}); // Push the values into the pcp
+                //}
                 }
               }
             }
@@ -5309,7 +5314,7 @@ if (points.length) { // If points exist (at least 1 point)
   if (lessmore[0] < lessmore[1]){
     wrapData2.reverse();
   }
-
+  console.log(dataFeatures)
       var AllPointsWrapData2 = [];
       for (var i=0; i<points.length; i++){
         var data = [];
@@ -5330,6 +5335,7 @@ if (points.length) { // If points exist (at least 1 point)
                 //if (m == j){
                   Object.assign(data,{[Object.keys(dataFeatures[points[i].id])[indices[m]]]:parseFloat(Object.values(dataFeatures[points[i].id])[indices[m]]).toFixed(1)}); // Push the values into the pcp
                   //Object.assign(data,{[Object.keys(dataFeatures[points[i].id])[m]]:parseFloat(Object.values(dataFeatures[points[i].id])[m]).toFixed(1)}); // Push the values into the pcp
+                //}
                 }
               }
             }