clean the remaining but deleted files
This commit is contained in:
parent
bfcbfa356a
commit
d53656a046
52
greedy.py
52
greedy.py
@ -1,52 +0,0 @@
|
|||||||
import csv
|
|
||||||
|
|
||||||
class Item:
|
|
||||||
def __init__(self, weight, value):
|
|
||||||
self.weight = weight
|
|
||||||
self.value = value
|
|
||||||
self.ratio = value / weight
|
|
||||||
|
|
||||||
def fractional_knapsack(capacity, items):
|
|
||||||
# sort items by value-to-weight ration in descending order
|
|
||||||
items.sort(key=lambda x: x.ratio, reverse=True)
|
|
||||||
total_value = 0
|
|
||||||
remaining_capacity = capacity
|
|
||||||
for item in items:
|
|
||||||
if remaining_capacity >= item.weight:
|
|
||||||
total_value += item.value
|
|
||||||
remaining_capacity -= item.weight
|
|
||||||
else:
|
|
||||||
total_value += item.ratio * remaining_capacity
|
|
||||||
break
|
|
||||||
return total_value
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def listFromFile(csv_file):
|
|
||||||
liste = []
|
|
||||||
with open(csv_file) as file:
|
|
||||||
data = csv.reader(file)
|
|
||||||
for i in data:
|
|
||||||
liste.append(i)
|
|
||||||
liste.pop(0)
|
|
||||||
for item in liste:
|
|
||||||
item[1] = float(item[1])
|
|
||||||
item[2] = float(item[2])
|
|
||||||
return liste
|
|
||||||
|
|
||||||
|
|
||||||
def greedy(capacity:int, items:[]):
|
|
||||||
# sort items by value-to-weight ration in descending order
|
|
||||||
items.sort(key=lambda x: x.ratio, reverse=True)
|
|
||||||
selected_items = []
|
|
||||||
total_value = 0
|
|
||||||
remaining_capacity = capacity
|
|
||||||
for item in items:
|
|
||||||
if remaining_capacity >= item.weight:
|
|
||||||
total_value += item.value
|
|
||||||
remaining_capacity -= item.weight
|
|
||||||
selected_items.append(item)
|
|
||||||
else:
|
|
||||||
total_value += item.ratio * remaining_capacity
|
|
||||||
break
|
|
||||||
return selected_items, total_value
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
import csv
|
|
||||||
|
|
||||||
def listFromFile(csv_file):
|
|
||||||
liste = []
|
|
||||||
with open(csv_file) as file:
|
|
||||||
data = csv.reader(file)
|
|
||||||
for i in data:
|
|
||||||
liste.append(i)
|
|
||||||
liste.pop(0)
|
|
||||||
for item in liste:
|
|
||||||
item[1] = int(item[1])
|
|
||||||
item[2] = float(item[2].strip("%"))
|
|
||||||
|
|
||||||
return liste
|
|
||||||
|
|
||||||
def listFromFile2(csv_file):
|
|
||||||
liste = []
|
|
||||||
with open(csv_file) as file:
|
|
||||||
data = csv.reader(file)
|
|
||||||
for i in data:
|
|
||||||
liste.append(i)
|
|
||||||
liste.pop(0)
|
|
||||||
for item in liste:
|
|
||||||
item[1] = float(item[1])
|
|
||||||
item[2] = float(item[2])
|
|
||||||
return liste
|
|
||||||
|
|
||||||
def splitListe(liste):
|
|
||||||
liste1 = []
|
|
||||||
liste2 = []
|
|
||||||
|
|
||||||
for i in range(len(liste)):
|
|
||||||
if (i < 10):
|
|
||||||
print(liste[i])
|
|
||||||
liste1.append(liste[i])
|
|
||||||
if (i >= 10):
|
|
||||||
liste2.append(liste[i])
|
|
||||||
|
|
||||||
|
|
||||||
28
permute.py
28
permute.py
@ -1,28 +0,0 @@
|
|||||||
def permute(liste):
|
|
||||||
if len(liste) == 0:
|
|
||||||
return []
|
|
||||||
|
|
||||||
if len(liste) == 1:
|
|
||||||
return [liste]
|
|
||||||
|
|
||||||
permutations = []
|
|
||||||
|
|
||||||
for i in range(len(liste)):
|
|
||||||
current = liste[i]
|
|
||||||
remaining = liste[:i] + liste[i+1:]
|
|
||||||
|
|
||||||
for p in permute(remaining):
|
|
||||||
permutations.append([current] + p)
|
|
||||||
|
|
||||||
return permutations
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
liste = []
|
|
||||||
|
|
||||||
for i in range(1, 6):
|
|
||||||
liste.append(i)
|
|
||||||
|
|
||||||
|
|
||||||
test = permute(liste)
|
|
||||||
print(test)
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
from math import log
|
|
||||||
|
|
||||||
def powerset(xs):
|
|
||||||
result = [[]]
|
|
||||||
for x in xs:
|
|
||||||
newsubsets = [subset + [x] for subset in result]
|
|
||||||
result.extend(newsubsets)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def powerset2(orig, newset):
|
|
||||||
if orig == []:
|
|
||||||
return [newset]
|
|
||||||
else:
|
|
||||||
res = []
|
|
||||||
for s in powerset2(orig[1:], newset+[orig[0]]):
|
|
||||||
res.append(s)
|
|
||||||
for s in powerset2(orig[1:], newset):
|
|
||||||
res.append(s)
|
|
||||||
return res
|
|
||||||
|
|
||||||
def powerset3(orig, newset):
|
|
||||||
if orig == []:
|
|
||||||
yield newset
|
|
||||||
else:
|
|
||||||
for s in powerset3(orig[1:], newset+[orig[0]]):
|
|
||||||
yield s
|
|
||||||
for s in powerset3(orig[1:], newset):
|
|
||||||
yield s
|
|
||||||
|
|
||||||
def powerset4(lst):
|
|
||||||
if len(lst) <= 1:
|
|
||||||
yield lst
|
|
||||||
yield []
|
|
||||||
else:
|
|
||||||
for x in powerset4(lst[1:]):
|
|
||||||
yield [lst[0]] + x
|
|
||||||
yield x
|
|
||||||
|
|
||||||
def powerset5(lst):
|
|
||||||
if lst == []:
|
|
||||||
yield []
|
|
||||||
else:
|
|
||||||
for s in powerset5(lst[1:]):
|
|
||||||
yield s + [lst[0]]
|
|
||||||
yield s
|
|
||||||
|
|
||||||
def powerset6(lst):
|
|
||||||
pairs = [(2**i, x) for i, x in enumerate(lst)]
|
|
||||||
for i in xrange(2**len(pairs)):
|
|
||||||
yield [x for (mask, x) in pairs if i & mask]
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
l = [1,2,3]
|
|
||||||
|
|
||||||
# print(powerset(l))
|
|
||||||
# print(powerset2(l, []))
|
|
||||||
# print list(powerset3(l, []))
|
|
||||||
# print list(powerset4(l))
|
|
||||||
# print list(powerset5(l))
|
|
||||||
# print list(powerset6(l))
|
|
||||||
|
|
||||||
# n = 8
|
|
||||||
# for i in range(n):
|
|
||||||
# b = str(bin(i))[2:]
|
|
||||||
# if n % 2 != 0:
|
|
||||||
# l = int(1.0+len(n, 2))
|
|
||||||
# else:
|
|
||||||
# l = int(log(n, 2))
|
|
||||||
# b = '0'*(l - len(b)) + b
|
|
||||||
# print b
|
|
||||||
66
sacadeux.py
66
sacadeux.py
@ -1,66 +0,0 @@
|
|||||||
import csv
|
|
||||||
|
|
||||||
def listFromFile(csv_file):
|
|
||||||
liste = []
|
|
||||||
with open(csv_file) as file:
|
|
||||||
data = csv.reader(file)
|
|
||||||
for i in data:
|
|
||||||
liste.append(i)
|
|
||||||
liste.pop(0)
|
|
||||||
for item in liste:
|
|
||||||
item[1] = float(item[1])
|
|
||||||
item[2] = float(item[2])
|
|
||||||
return liste
|
|
||||||
|
|
||||||
def sac_a_dos(actions, cout_maximal):
|
|
||||||
n = len(actions)
|
|
||||||
# Créer une table pour stocker les résultats des sous-problèmes
|
|
||||||
table = [[0 for x in range(cout_maximal + 1)] for x in range(n + 1)]
|
|
||||||
|
|
||||||
# Construire la table de programmation dynamique
|
|
||||||
for i in range(n + 1):
|
|
||||||
for w in range(int(cout_maximal) + 1):
|
|
||||||
print(w - actions[i-1]['cout'])
|
|
||||||
#print(w-actions[i-1])
|
|
||||||
if i == 0 or w == 0:
|
|
||||||
table[i][w] = 0.0
|
|
||||||
elif actions[i-1]['cout'] <= w:
|
|
||||||
table[i][w] = max(actions[i-1]['rendement'] + table[i-1][int(w-actions[i-1]['cout'])], table[i-1][w])
|
|
||||||
else:
|
|
||||||
table[i][w] = table[i-1][w]
|
|
||||||
|
|
||||||
|
|
||||||
for i in range(n + 1):
|
|
||||||
print(f"\ntable[{i}][60]", table[i][60], i-1)
|
|
||||||
print(f"actions[{i}-1]['rendement']", actions[i-1]['rendement'])
|
|
||||||
print(f"table[{i}-1][(60-actions[{i}-1]['cout'])]", table[i-1][(60-actions[i-1]['cout'])])
|
|
||||||
print(f"table[{i}-1][60]", table[i-1][60])
|
|
||||||
print(f"actions[{i}-1]['rendement'] + table[{i}-1][(60-actions[{i}-1]['cout'])], table[{i}-1][60]", actions[i-1]['rendement'] + table[i-1][(w-actions[i-1]['cout'])], table[i-1][w])
|
|
||||||
# Trouver les actions sélectionnées
|
|
||||||
w = cout_maximal
|
|
||||||
actions_selectionnees = []
|
|
||||||
for i in range(n, 0, -1):
|
|
||||||
if table[i][int(w)] != table[i-1][int(w)]:
|
|
||||||
actions_selectionnees.append(actions[i-1])
|
|
||||||
w -= actions[i-1]['cout']
|
|
||||||
|
|
||||||
return table[n][cout_maximal], actions_selectionnees
|
|
||||||
|
|
||||||
|
|
||||||
def display_result():
|
|
||||||
print(f"Rendement maximal: {rendement_maximal}%")
|
|
||||||
print("Actions sélectionnees:")
|
|
||||||
for action in actions_selectionnees:
|
|
||||||
print(
|
|
||||||
f"Nom: {action['nom']}, Cout: {action['cout']}, Rendement: {action['rendement']}%")
|
|
||||||
|
|
||||||
#actions = listFromFile("/home/b/Documents/OCR/projet7/actions.csv")
|
|
||||||
actions = listFromFile("/home/b/Documents/OCR/projet7/ph3/dataset1_Python+P7.csv")
|
|
||||||
# Conversion de la liste en dictionnaires pour faciliter l'accès
|
|
||||||
actions = [{'nom': action[0], 'cout': action[1], 'rendement': action[2]} for action in actions]
|
|
||||||
|
|
||||||
#print(actions[22]['cout'], type(actions[22]['cout']))
|
|
||||||
cout_maximal = 500
|
|
||||||
rendement_maximal, actions_selectionnees = sac_a_dos(actions, cout_maximal)
|
|
||||||
|
|
||||||
# display_result()
|
|
||||||
48
sacados.py
48
sacados.py
@ -1,48 +0,0 @@
|
|||||||
from importactions import listFromFile, listFromFile2
|
|
||||||
|
|
||||||
def sac_a_dos(actions, cout_maximal):
|
|
||||||
n = len(actions)
|
|
||||||
# Créer une table pour stocker les résultats des sous-problèmes
|
|
||||||
table = [[0 for x in range(cout_maximal + 1)] for x in range(n + 1)]
|
|
||||||
|
|
||||||
# Construire la table de programmation dynamique
|
|
||||||
for i in range(n + 1):
|
|
||||||
for w in range(cout_maximal + 1):
|
|
||||||
#print('\ni', i, 'w', w)
|
|
||||||
#print(actions[i-1]['cout'], )
|
|
||||||
if i == 0 or w == 0:
|
|
||||||
table[i][w] = 0
|
|
||||||
elif actions[i-1]['cout'] <= w:
|
|
||||||
table[i][w] = max(actions[i-1]['rendement'] + table[i-1][(w-actions[i-1]['cout'])], table[i-1][w])
|
|
||||||
else:
|
|
||||||
table[i][w] = table[i-1][w]
|
|
||||||
|
|
||||||
# Trouver les actions sélectionnées
|
|
||||||
w = cout_maximal
|
|
||||||
actions_selectionnees = []
|
|
||||||
for i in range(n, 0, -1):
|
|
||||||
if table[i][w] != table[i-1][w]:
|
|
||||||
actions_selectionnees.append(actions[i-1])
|
|
||||||
w -= actions[i-1]['cout']
|
|
||||||
|
|
||||||
return table[n][cout_maximal], actions_selectionnees
|
|
||||||
|
|
||||||
|
|
||||||
def display_result():
|
|
||||||
print(f"Rendement : {sum(x['cout'] * x['rendement']/100 for x in actions_selectionnees)}€")
|
|
||||||
print(f"Cout: {sum(x['cout'] for x in actions_selectionnees)}€")
|
|
||||||
print("Actions sélectionnees:")
|
|
||||||
for action in actions_selectionnees:
|
|
||||||
print(
|
|
||||||
f"Nom: {action['nom']}, Cout: {action['cout']}, Rendement: {action['rendement']}%")
|
|
||||||
|
|
||||||
actions = listFromFile("/home/b/Documents/OCR/projet7/actions.csv")
|
|
||||||
#actions = listFromFile2("/home/b/Documents/OCR/projet7/ph3/dataset1_Python+P7.csv")
|
|
||||||
# Conversion de la liste en dictionnaires pour faciliter l'accès
|
|
||||||
actions = [{'nom': action[0], 'cout': action[1], 'rendement': action[2]} for action in actions]
|
|
||||||
|
|
||||||
#print(actions[22]['cout'], type(actions[22]['cout']))
|
|
||||||
cout_maximal = 500
|
|
||||||
rendement_maximal, actions_selectionnees = sac_a_dos(actions, cout_maximal)
|
|
||||||
|
|
||||||
display_result()
|
|
||||||
11
test.py
11
test.py
@ -1,11 +0,0 @@
|
|||||||
def dig_root(n: int) -> int | None:
|
|
||||||
s = 0
|
|
||||||
if len(str(n)) == 1:
|
|
||||||
s = n
|
|
||||||
return s
|
|
||||||
for i in str(n):
|
|
||||||
s += int(i)
|
|
||||||
dig_root(s)
|
|
||||||
|
|
||||||
|
|
||||||
print(dig_root(942))
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
import csv
|
|
||||||
|
|
||||||
def listFromFile(csv_file):
|
|
||||||
liste = []
|
|
||||||
with open(csv_file) as file:
|
|
||||||
data = csv.reader(file)
|
|
||||||
for i in data:
|
|
||||||
liste.append(i)
|
|
||||||
liste.pop(0)
|
|
||||||
for item in liste:
|
|
||||||
item[1] = float(item[1])
|
|
||||||
item[2] = float(item[2])
|
|
||||||
return liste
|
|
||||||
|
|
||||||
def sac_a_dos_float(actions, cout_maximal):
|
|
||||||
n = len(actions)
|
|
||||||
table = [[0.0 for x in range(int(cout_maximal) + 1)] for x in range(n + 1)]
|
|
||||||
|
|
||||||
# Dynamic programing table
|
|
||||||
for i in range(n + 1):
|
|
||||||
for w in range(int(cout_maximal) + 1):
|
|
||||||
if i == 0 or w == 0:
|
|
||||||
table[i][w] = 0.0
|
|
||||||
elif actions[i-1]['cout'] <= w:
|
|
||||||
table[i][w] = max(actions[i-1]['rendement'] + table[i-1][int(w-actions[i-1]['cout'])], table[i-1][w])
|
|
||||||
else:
|
|
||||||
table[i][w] = table[i-1][w]
|
|
||||||
|
|
||||||
# Select
|
|
||||||
w = cout_maximal
|
|
||||||
actions_selectionnees = []
|
|
||||||
for i in range(n, 0, -1):
|
|
||||||
if table[i][int(w)] != table[i-1][int(w)]:
|
|
||||||
actions_selectionnees.append(actions[i-1])
|
|
||||||
w -= actions[i-1]['cout']
|
|
||||||
|
|
||||||
return table[n][int(cout_maximal)], actions_selectionnees
|
|
||||||
|
|
||||||
actions = listFromFile("/home/b/Documents/OCR/projet7/ph3/dataset1_Python+P7.csv")
|
|
||||||
actionstmp = [{'nom': action[0], 'cout': action[1], 'rendement': action[2]} for action in actions if action[1] > 0.0]
|
|
||||||
actions = sorted(actionstmp, key=lambda x: x['cout'])
|
|
||||||
|
|
||||||
actions2 = listFromFile("/home/b/Documents/OCR/projet7/ph3/dataset2_Python+P7.csv")
|
|
||||||
actions2tmp = [{'nom': action[0], 'cout': action[1], 'rendement': action[2]} for action in actions2 if action[1] > 0.0]
|
|
||||||
actions2 = sorted(actions2tmp, key=lambda x: x['cout'])
|
|
||||||
|
|
||||||
|
|
||||||
cout_maximal = 500
|
|
||||||
|
|
||||||
valeur_maximale, actions_selectionnees = sac_a_dos_float(actions, cout_maximal)
|
|
||||||
valeur_maximale2, actions_selectionnees2 = sac_a_dos_float(actions2, cout_maximal)
|
|
||||||
|
|
||||||
print("\nDATASET 1\n")
|
|
||||||
print(f"Cout: {sum(x['cout'] for x in actions_selectionnees):.2f}")
|
|
||||||
print(f"Rendement: {sum((x['cout']*x['rendement']/100)for x in actions_selectionnees):.2f}")
|
|
||||||
print(f"Actions sélectionnées: {[x['nom'] for x in actions_selectionnees]}")
|
|
||||||
|
|
||||||
print("\nDATASET 2\n")
|
|
||||||
print(f"Cout: {sum(x['cout'] for x in actions_selectionnees2):.2f}")
|
|
||||||
print(f"Rendement: {sum((x['cout']*x['rendement']/100)for x in actions_selectionnees2):.2f}")
|
|
||||||
print(f"Actions sélectionnées: {[x['nom'] for x in actions_selectionnees2]}")
|
|
||||||
Loading…
x
Reference in New Issue
Block a user