Commit bc8d4e96 authored by Marc Serramia's avatar Marc Serramia

Relations experiments complete data, norm experiments partial data

parent b7490560
......@@ -34,12 +34,12 @@ PROB_VALUE_NORMS = 0.5
#---SPECIFIC EXPERIMENT SETTINGS---
#FIXED Settings
"""
#"""
EXPERIMENT_TYPE = "SIMPLE"
NUM_NORMS = 1000
NUM_VALUES = 100
PERC_VALUES = None #Overwrites NUM_VALUES
"""
#"""
#RANGE_RATIO Settings
"""
......@@ -50,12 +50,12 @@ PERC_VALUES = None #Overwrites NUM_VALUES
"""
#RANGE_NORMS Settings
#"""
"""
EXPERIMENT_TYPE = "RANGE_NORMS"
NUM_NORMS = range(100,5000,100)
NUM_NORMS = range(100,900,100)
NUM_VALUES = None
PERC_VALUES = 0.1 #Overwrites NUM_VALUES
#"""
"""
#RANGE_VALUES Settings
"""
......@@ -101,12 +101,13 @@ POINT_SIZE = 10
"""
#SCALABILITY_PROB SETTINGS:
"""
#"""
PLOT_TYPE = "SCALABILITY_PROB"
COLORS = ['cyan', 'deepskyblue', 'royalblue', 'blue', 'navy', 'black']
COLORS = ['navy', 'blue', 'cyan']
SD = False
PLOT_INCOMPATIBILITY_PROB = None#INCOMPATIBILITY_PROB
"""
PLOT_INCOMPATIBILITY_PROB = [0.5, 1, 0]#INCOMPATIBILITY_PROB
LABELS = ["Medium problem", "Easy problem", "No constraints"]
#"""
#VALUES SETTINGS:
"""
......@@ -119,9 +120,9 @@ POINT_SIZE = 10
#-----------------PROBLEM VISUALISER-----------------------
"""
#"""
VISUALISER_NORMS = 10
VISUALISER_DENSITY = 0.3
VISUALISER_DENSITY = 0.2
VISUALISER_INCOMP_PERC = 0.5
VISUALISER_HEIGHT = None
VISUALISER_WIDTH = None
......@@ -130,4 +131,4 @@ VISUALISER_ROUND = 0
VISUALISER_GENERATE = True
VISUALISER_PROBLEM_TYPE = "SIMPLE"
VISUALISER_NUM_VALUES = 5
"""
\ No newline at end of file
#"""
\ No newline at end of file
This diff is collapsed.
0,0,0,None,0,0,0,0.0
500,0,0,None,0,0,0,0.0009081363677978516
1000,0,0,None,0,0,0,0.0009608268737792969
1500,0,0,None,0,0,0,0.000980377197265625
2000,0,0,None,0,0,0,0.0012362003326416016
2500,0,0,None,0,0,0,0.0014176368713378906
3000,0,0,None,0,0,0,0.001621246337890625
3500,0,0,None,0,0,0,0.0017504692077636719
4000,0,0,None,0,0,0,0.0018825531005859375
4500,0,0,None,0,0,0,0.0020110607147216797
5000,0,0,None,0,0,0,0.0022072792053222656
0,0.5,0.5,None,0,0,0,0.0
500,0.5,0.5,None,31148,31084,121618,0.4615516662597656
1000,0.5,0.5,None,125154,124474,493143,0.9755468368530273
1500,0.5,0.5,None,280951,280779,1114254,3.110140323638916
2000,0.5,0.5,None,499646,500347,1985291,6.332507371902466
2500,0.5,0.5,None,780519,780925,3106943,11.64422059059143
3000,0.5,0.5,None,1124561,1125307,4478579,16.87899422645569
3500,0.5,0.5,None,1531205,1531229,6099861,24.76186752319336
4000,0.5,0.5,None,1999412,2000367,7971800,29.471319913864136
4500,0.5,0.5,None,2530026,2532142,10092879,39.39276671409607
5000,0.5,0.5,None,3123966,3124856,12464994,48.79201412200928
0,1,0.5,None,0,0,0,0.0
500,1,0.5,None,62419,62331,123980,0.08569765090942383
1000,1,0.5,None,249448,250052,497894,0.3741178512573242
1500,1,0.5,None,562572,561678,1122013,0.9709632396697998
2000,1,0.5,None,1000400,998600,1995727,1.7137885093688965
2500,1,0.5,None,1562519,1561231,3119570,2.784064769744873
3000,1,0.5,None,2248370,2250130,4493652,3.982619047164917
3500,1,0.5,None,3063774,3059476,6117518,5.741598606109619
4000,1,0.5,None,3998363,3999637,7991744,7.767772436141968
4500,1,0.5,None,5063333,5059417,10115398,9.855771780014038
5000,1,0.5,None,6249259,6248241,12489427,12.42179274559021
......@@ -284,8 +284,8 @@ class Plot:
line = plotfile.readline()
data = line.strip('\n').split(',')
num_norms = data[0]
height = data[1]
width = data[2]
density = data[1]
inc_perc = data[2]
inc_prob = data[3]
num_inc = data[4]
num_dgen = data[5]
......@@ -294,10 +294,10 @@ class Plot:
if not num_norms in times:
times[num_norms] = {}
sd[num_norms] = {}
if not inc_prob in times[num_norms]:
times[num_norms][inc_prob] = []
sd[num_norms][inc_prob] = None
times[num_norms][inc_prob].append(float(time))
if not density in times[num_norms]:
times[num_norms][density] = []
sd[num_norms][density] = None
times[num_norms][density].append(float(time))
size -= len(line)
plotfile.close()
return times, sd
......@@ -330,10 +330,12 @@ class Plot:
timesp[p].append(times[n][p])
sdp[p].append(sd[n][p])
num = 0
for p in probs:
for i in range(len(probs)):
p = probs[i]
l = PARAMETERS.LABELS[i]
x = norms
y = timesp[p]
plt.plot(x, y, marker='o', markerfacecolor=PARAMETERS.COLORS[len(PARAMETERS.COLORS)-len(probs)+num], markersize=12, color=PARAMETERS.COLORS[len(PARAMETERS.COLORS)-len(probs)+num], linewidth=4, label= p)
plt.plot(x, y, marker='o', markerfacecolor=PARAMETERS.COLORS[len(PARAMETERS.COLORS)-len(probs)+num], markersize=12, color=PARAMETERS.COLORS[len(PARAMETERS.COLORS)-len(probs)+num], linewidth=4, label= l)
if PARAMETERS.SD:
deviations = sdp[p]
lowlimits = []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment