Commit 97ed41b6 authored by Marc Serramia's avatar Marc Serramia

Prepared experiments range norms 500N

parent f17b8653
......@@ -5,7 +5,7 @@ import numpy as np
BUILD = True
SOLVE = True
MAINTAIN_PLOT = True
SOLVE_TIME_LIMIT = 60
SOLVE_TIME_LIMIT = 600
ROUNDS = 10
#---PROBLEM GENERATION SETTINGS---
......@@ -23,8 +23,8 @@ RELATION_DENSITY = None
#METHOD2: Density-Incomp-perc
#"""
RELATION_DENSITY = [0.2]#np.arange(0,1.01, 0.1)
INCOMPATIBILITY_PERC = [0.2]#np.arange(0, 1.01, 0.01)
RELATION_DENSITY = np.arange(0, 1, 0.05)
INCOMPATIBILITY_PERC = np.arange(0.01, 1.01, 0.01)
#"""
#---VALUES SETTINGS---
......@@ -34,20 +34,20 @@ PROB_VALUE_NORMS = 0.2
#---SPECIFIC EXPERIMENT SETTINGS---
#FIXED Settings
#"""
"""
EXPERIMENT_TYPE = "SIMPLE"
NUM_NORMS = 20
NUM_VALUES = 2
NUM_NORMS = 1000
NUM_VALUES = 100
PERC_VALUES = None #Overwrites NUM_VALUES
#"""
"""
#RANGE_RATIO Settings
"""
#"""
EXPERIMENT_TYPE = "RANGE_RATIO"
NUM_NORMS = 1000
NUM_VALUES = [100]
NUM_NORMS = 500
NUM_VALUES = [50]
PERC_VALUES = None #Overwrites NUM_VALUES
"""
#"""
#RANGE_NORMS Settings
"""
......@@ -71,7 +71,7 @@ SAVE = True
SHOW = True
#RATIO SETTINGS
#"""
"""
PLOT_TYPE = "RATIO"
PLOT_NORMS = 1000
RATIO_TYPE = "I"
......@@ -82,7 +82,7 @@ SHOW_X_RANGE = [0, 1e55]
SHOW_Y_RANGE = [0, 600]
POINT_COLOR = "blue"
POINT_SIZE = 10
#"""
"""
#SCALABILITY SETTINGS:
"""
......@@ -114,10 +114,10 @@ POINT_SIZE = 10
#-----------------PROBLEM VISUALISER-----------------------
#"""
VISUALISER_NORMS = 1000
VISUALISER_DENSITY = 0.5
VISUALISER_INCOMP_PERC = 0.6
"""
VISUALISER_NORMS = 10
VISUALISER_DENSITY = 1
VISUALISER_INCOMP_PERC = 0.5
VISUALISER_HEIGHT = None
VISUALISER_WIDTH = None
VISUALISER_PROB_INC = None
......@@ -125,4 +125,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
......@@ -2,7 +2,6 @@ import os
import sys
import PARAMETERS
import numpy as np
import pandas as pd
import matplotlib.pyplot as plt
class Plot:
......
......@@ -275,7 +275,7 @@ class Problem:
lp_file.write('/* # Width: ' + str(self.width) + ' */\n')
lp_file.write('/* # Direct generalisation relations: ' + str(self.direct_gen) + ' */\n')
lp_file.write('/* # Indirect generalisation relations: ' + str(self.indirect_gen) + ' */\n')
lp_file.write('/* # Exclusivity relations: ' + str(self.num_incomp) + ' */\n')
lp_file.write('/* # Incompatibility relations: ' + str(self.num_incomp) + ' */\n')
lp_file.write("/*--------------------*/\n")
else:
......@@ -286,7 +286,7 @@ class Problem:
lp_file.write('/* # Generalisation percentage: ' + str(int(100-self.perc_inc*100)) + ' */\n')
lp_file.write('/* # Direct generalisation relations: ' + str(self.direct_gen) + ' */\n')
lp_file.write('/* # Indirect generalisation relations: ' + str(self.indirect_gen) + ' */\n')
lp_file.write('/* # Exclusivity relations: ' + str(self.num_incomp) + ' */\n')
lp_file.write('/* # Incompatibility relations: ' + str(self.num_incomp) + ' */\n')
lp_file.write("/*--------------------*/\n")
#Optimisation formula
......
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