From 8cc003cc0341676323cb6ab030fb01afdd7a9e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= <i.hoerler@me.com>
Date: Mon, 23 Jul 2018 20:59:59 +0200
Subject: [PATCH] cleanup

---
 .../cluster_dependencies/JsonModel.cs         | 27 -------------
 .../Models/{Cluster.cs => ClusterModel.cs}    |  2 +-
 .../Models/ClusterOrigin.cs                   | 38 -------------------
 .../Models/ClusterPatient.cs                  | 38 -------------------
 .../Models/ClusterResult.cs                   | 38 -------------------
 5 files changed, 1 insertion(+), 142 deletions(-)
 delete mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
 rename EHEC_Server/EHEC_Server/cluster_dependencies/Models/{Cluster.cs => ClusterModel.cs} (89%)
 delete mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterOrigin.cs
 delete mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
 delete mode 100644 EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs

diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
deleted file mode 100644
index b4b498f..0000000
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/JsonModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Newtonsoft.Json;
-
-namespace EHEC_Server
-{
-    public class JsonModel
-    { 
-        public IList<JsonNodeModel> Node { get; set; } = new List<JsonNodeModel>();
-        public IList<JsonEdgesModel> Edge { get; set; } = new List<JsonEdgesModel>();
-    }
-    public class JsonNodeModel
-    {
-        public int Id { get; set; }
-        public string Nodetype { get; set; }
-        public string Name { get; set; }
-    }
-    public class JsonEdgesModel
-    {
-        public int Source { get; set; }
-        public int Target { get; set; }
-        public string EdgeType { get; set; }
-    }
-
-}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Cluster.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
similarity index 89%
rename from EHEC_Server/EHEC_Server/cluster_dependencies/Models/Cluster.cs
rename to EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
index 99989a0..f1241a3 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Cluster.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
@@ -5,7 +5,7 @@ using System.Web;
 
 namespace EHEC_Server
 {
-    public class Cluster
+    public class ClusterModel
     {
         public string Comment { get; set; }
         public List<Node> Nodes { get; set; }
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterOrigin.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterOrigin.cs
deleted file mode 100644
index ca259b4..0000000
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterOrigin.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace EHEC_Server
-{
-    /// <summary>
-    /// This clas converts the object from db model to the needs of Json 
-    /// conversion for Clusteranalysis.
-    /// </summary>
-    public class ClusterOrigin
-    {
-        //public int Id { get; set; }
-        //public string Name { get; set; }
-        //public string Nodetype { get; set; }
-
-        //public ClusterOrigin() { }
-        //public List<ClusterOrigin> GetClusterOrigins()
-        //{
-        //    Origin origin = new Origin();
-        //    List<Origin> origins = new List<Origin>();
-        //    origins = origin.GetAllOrigins();
-        //    List<ClusterOrigin> clusterOrigins = new List<ClusterOrigin>();
-        //    foreach (Origin element in origins)
-        //    {
-        //        ClusterOrigin clusterOrigin = new ClusterOrigin
-        //        {
-        //            Id = element.OriginId,
-        //            Nodetype = "origin",
-        //            Name = element.City
-        //        };
-        //        clusterOrigins.Add(clusterOrigin);
-        //    };
-        //    return clusterOrigins;
-        //}
-    }
-}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
deleted file mode 100644
index 337781b..0000000
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace EHEC_Server
-{
-    /// <summary>
-    /// This clas converts the object from db model to the needs of Json 
-    /// conversion for Clusteranalysis.
-    /// </summary>
-    public class ClusterPatient
-    {
-        //public int Id { get; set; }
-        //public string Name { get; set; }
-        //public string Nodetype { get; set; }
-
-        //public ClusterPatient() { }
-        //public List<ClusterPatient> GetClusterPatients()
-        //{
-        //    Patient patient = new Patient();
-        //    List<Patient> patients = new List<Patient>();
-        //    patients = patient.GetAllPatients();
-        //    List<ClusterPatient> clusterPatients = new List<ClusterPatient>();
-        //    foreach (Patient element in patients)
-        //    {
-        //        ClusterPatient clusterPatient = new ClusterPatient
-        //        {
-        //            Id = element.PatientId,
-        //            Nodetype = "patient",
-        //            Name = element.FirstName + " " + element.LastName
-        //        };
-        //        clusterPatients.Add(clusterPatient);
-        //    }
-        //    return clusterPatients;
-        //}
-    }   
-}
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs
deleted file mode 100644
index 7db213f..0000000
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterResult.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace EHEC_Server
-{
-    /// <summary>
-    /// This clas converts the object from db model to the needs of Json 
-    /// conversion for Clusteranalysis.
-    /// </summary>
-    public class ClusterResult
-    {
-        //public int Id { get; set; }
-        //public string Name { get; set; }
-        //public string Nodetype { get; set; }
-
-        //public ClusterResult() { }
-        //public List<ClusterResult> GetClusterResults()
-        //{
-        //    Result result = new Result();
-        //    List<Result> results = new List<Result>();
-        //    results = result.GetAllResults();
-        //    List<ClusterResult> clusterResults = new List<ClusterResult>();
-        //    foreach (Result element in results)
-        //    {
-        //        ClusterResult clusterResult = new ClusterResult
-        //        {
-        //            Id = element.ResultId,
-        //            Nodetype = "result",
-        //            Name = element.Name
-        //        };
-        //        clusterResults.Add(clusterResult);
-        //    };
-        //    return clusterResults;
-        //}
-    }
-}
\ No newline at end of file