kmeans Minor Bugfixes

- Added cluster to test generator
- Added sample data to main
This commit is contained in:
2018-06-02 23:30:07 +02:00
parent 7ea392c302
commit 4e3ceac4a9
4 changed files with 62 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
# Calculate the difference between two points giving the indexes of these data entries
def calcdiff(point1, point2, data):
def calcdiff(point1, point2):
if int(point2) > int(point1):
difference = int(point2) - int(point1)
else:
@@ -19,4 +19,22 @@ def findHighest(data):
for i in range(0, len(data)):
if int(data[i]) > maximum:
maximum = int(data[i])
return maximum
return maximum
def pp_calcdiff(data, clusterpoint):
max_diff = 0
new_cluster = 0
for item in range(0,len(data)):
if calcdiff(data[item], clusterpoint) > max_diff:
max_diff = calcdiff(data[item], clusterpoint)
new_cluster = data[item]
return new_cluster
def pp_calcdiff_2(data, clusterpoint, clusterpoint_2):
max_diff = 0
new_cluster = 0
for item in range(0,len(data)):
if calcdiff(data[item], clusterpoint) + calcdiff(data[item], clusterpoint_2) > max_diff:
max_diff = calcdiff(data[item], clusterpoint)
new_cluster = data[item]
return new_cluster