added graph

simon-gd · Jul 29, 2019 · e7209a3 · e7209a3
1 parent af18326
commit e7209a3
Show file tree

Hide file tree

Showing 5 changed files with 650 additions and 588 deletions.
diff --git a/SeuratExtension/SeuratExtension.csproj b/SeuratExtension/SeuratExtension.csproj
@@ -68,9 +68,6 @@
     <PackageReference Include="DynamoVisualProgramming.ZeroTouchLibrary" version="2.2.*">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Chart.Controls">
-      <Version>4.7.2046</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="src\Clustering.cs" />

diff --git a/SeuratExtension/src/html/playground.js b/SeuratExtension/src/html/playground.js
@@ -196,8 +196,8 @@ function getVectorDataMetrics2D() {
         x += (data[i2][j2] / maxVals[j2]) * dataStream[0].x[j2];
         y += (data[i2][j2] / maxVals[j2]) * dataStream[0].y[j2];
       }
-      //x /= labels.length;
-      //y /= labels.length;
+      x /= labels.length;
+      y /= labels.length;
 
       dataStream[1].x.push(x);
       dataStream[1].y.push(y);

diff --git a/...ity-north-campus.RefineryResults/7c062c3a-f912-415e-917f-c26bce8df6b6/analysis/index.html b/...ity-north-campus.RefineryResults/7c062c3a-f912-415e-917f-c26bce8df6b6/analysis/index.html
@@ -34,6 +34,7 @@ <h2>Graph</h2>
         <!--<p>
             <input type="button" value="Draw graph" onclick="draw();" id="draw">
         </p>-->
+        <div id="2dVectorGraph" style="width:700px;height:450px;padding-bottom: 3px;"></div>
         <div id="2dGraph" style="width:700px;height:450px;padding-bottom: 3px;"></div>
         <div id="3dGraph"></div>
 

diff --git a/...-north-campus.RefineryResults/7c062c3a-f912-415e-917f-c26bce8df6b6/analysis/playground.js b/...-north-campus.RefineryResults/7c062c3a-f912-415e-917f-c26bce8df6b6/analysis/playground.js
@@ -14,6 +14,11 @@ function load() {
   Graph2D = document.getElementById('2dGraph');
 	Plotly.plot( Graph2D, data2D, {
   margin: { t: 0, b: 0 } } );
+
+  var data2D_2 = getVectorDataMetrics2D();
+  Graph2DVector = document.getElementById('2dVectorGraph');
+	Plotly.plot( Graph2DVector, data2D_2, {
+  margin: { t: 0, b: 0 } } );
 
   Graph2D.on('plotly_click', function(data){
       var pts = '';
@@ -129,6 +134,62 @@ function getDataClusterStats2D() {
   return dataStream;
 }
 
+function getVectorDataMetrics2D() {
+  var labels = allGoals;
+  var data = allValues;
+  var dataStream = [];
+  var angle = (2* Math.PI) / labels.length;
+  var vecX = [];
+  var vecY = [];
+  var a = 0;
+
+
+  dataStream.push({x:[], y:[], text:[],
+    mode: 'markers',
+    type: 'scatter',
+    name: 'Metrics',
+    marker: { size: 10 }
+    });
+  for (var i=0; i <  labels.length; ++i){
+    a = a+angle;
+    dataStream[0].x.push(Math.cos(a));
+    dataStream[0].y.push(Math.sin(a));
+    dataStream[0].text.push(labels[i]);
+
+  }
+
+  dataStream.push({x:[], y:[],
+    mode: 'markers',
+    type: 'scatter',
+    name: 'Data',
+    marker: { size: 3 }
+    });
+
+    var maxVals = {};
+    for (var i1=0; i1 <  data.length; ++i1){
+      for (var j=0; j < labels.length; j++){
+        if(!maxVals[j] || maxVals[j] < data[i1][j]){
+          maxVals[j] = data[i1][j];
+        }
+      }
+    }
+
+    for (var i2=0; i2 <  data.length; ++i2){
+      var x = 0;
+      var y = 0;
+      for (var j2=0; j2 < labels.length; j2++){
+        x += (data[i2][j2] / maxVals[j2]) * dataStream[0].x[j2];
+        y += (data[i2][j2] / maxVals[j2]) * dataStream[0].y[j2];
+      }
+      //x /= labels.length;
+      //y /= labels.length;
+
+      dataStream[1].x.push(x);
+      dataStream[1].y.push(y);
+    }
+  return dataStream;
+}
+
 function getDataMetrics2D() {
   //var csv = data; //document.getElementById("csvTextarea").value;