Last version.

Dollars · May 19, 2013 · 80ad416 · 80ad416
1 parent 0ebe6de
commit 80ad416
Show file tree

Hide file tree

Showing 16 changed files with 505 additions and 11 deletions.
diff --git a/MiniGame/mainGame.py b/MiniGame/mainGame.py
diff --git a/README.md b/README.md
@@ -2,3 +2,18 @@ svl
 ===
 
 Optimisation du placement de valves dans un réseau hydraulique
+
+===
+Voici le code et les document du groupe5:
+
+Pour lancer l'interface graphique:
+- cd src/graphical_interface
+- python graphical_interface.py
+
+Pour un simple test de chaque algorithme sur le réseau de Ferrara en console:
+- cd src/
+- python test.py
+(l'exécution prend +-6 minutes par algo)
+
+Les autres fichiers .dot sont des réseaux déjà représentés 
+sur l'interface graphique.
diff --git a/images/endsim.png b/images/endsim.png
diff --git a/images/mainmenu.png b/images/mainmenu.png
diff --git a/src/hydraulic_network/__init__.pyc b/src/hydraulic_network/__init__.pyc
diff --git a/src/hydraulic_network/globalnetwork.pyc b/src/hydraulic_network/globalnetwork.pyc
diff --git a/src/hydraulic_network/networks.pyc b/src/hydraulic_network/networks.pyc
diff --git a/src/hydraulic_network/node.pyc b/src/hydraulic_network/node.pyc
diff --git a/src/hydraulic_network/pipe.pyc b/src/hydraulic_network/pipe.pyc
diff --git a/src/hydraulic_network/segmentgraph.pyc b/src/hydraulic_network/segmentgraph.pyc
diff --git a/src/hydraulic_network/valve.pyc b/src/hydraulic_network/valve.pyc
diff --git a/src/optimization/__init__.pyc b/src/optimization/__init__.pyc
diff --git a/src/optimization/backtracking.pyc b/src/optimization/backtracking.pyc
diff --git a/src/optimization/genetic_algorithm.pyc b/src/optimization/genetic_algorithm.pyc
diff --git a/src/optimization/simulated_annealing.pyc b/src/optimization/simulated_annealing.pyc
diff --git a/src/test.py b/src/test.py
@@ -5,13 +5,6 @@
 
 import time
 
-def print_in_file(num, qual):
-	f = open('/home/dollars/Desktop/plouf.txt', 'a')
-#	total = 0.00
-#	for i in qual:
-#		total += i
-	f.write('{0} {1}\n'.format(num, qual))
-
 if __name__=="__main__": #petit exemple
 	print("Test de Network")
 
@@ -22,7 +15,7 @@ def print_in_file(num, qual):
 	pattern = [(0,1) for i in range(myNetwork.network.nbrPipes*2)]
 
 	t0 = time.time()
-	test = GeneticAlgorithm(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation], print_in_file)
+	test = GeneticAlgorithm(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation])
 	print(time.time()-t0)
 
 	print(test.solution)
@@ -37,7 +30,7 @@ def print_in_file(num, qual):
 	print(myNetwork.segNetwork.str_segments())
 
 	t0 = time.time()
-	test = GeneticAlgorithmVariation(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation], print_in_file)
+	test = GeneticAlgorithmVariation(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation])
 	print(time.time()-t0)
 
 	print(test.solution)
@@ -52,7 +45,7 @@ def print_in_file(num, qual):
 	print(myNetwork.segNetwork.str_segments())
 
 	t0 = time.time()
-	test = SimulatedAnnealing(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation], print_in_file)
+	test = SimulatedAnnealing(pattern, [myNetwork.average_valves_per_segment, myNetwork.average_segment_size, myNetwork.standard_deviation_segment_size, myNetwork.nbr_valves, myNetwork.average_unintended_isolation])
 	print(time.time()-t0)
 
 	print(test.solution)
@@ -64,4 +57,4 @@ def print_in_file(num, qual):
 	print(myNetwork.nbr_valves())
 
 	print(myNetwork.segNetwork.str_valves())
-	print(myNetwork.segNetwork.str_segments())
+	print(myNetwork.segNetwork.str_segments())