en cours

Src/Action.py

@@ -15,6 +15,7 @@ class Action():
 		self.Journee = {}
 		
 		self.valeur = 0
+		self.valref = 0
 		
 		#nombre d'action
 		self.possedent = 0
@@ -22,30 +23,30 @@ class Action():
 		self.valeurAchat = 0 
 
 		#NBNeurone par action
-		self.Tab = [0]*NBNeurone
+		self.Tab = [1]*NBNeurone
 
 		self.chaleur = 0
 
 	def MajQuotidient(self,date):
 		name=self.path+self.name+"-"+date
-		print(name)
 		F_Journee = open(name,"r")
 		self.Journee = ast.literal_eval(F_Journee.readline())
 		Quoti = ast.literal_eval(F_Journee.readline())
-		self.Tab[0]=float(Quoti["1semaine"][0].strip("%"))
-		self.Tab[1]=float(Quoti["1mois"][0].strip("%"))
-		self.Tab[2]=float(Quoti["3mois"][0].strip("%"))
-		self.Tab[3]=float(Quoti["6mois"][0].strip("%"))
-		self.Tab[4]=float(Quoti["1an"][0].strip("%"))
+		self.valref = float(Quoti["1semaine"][1])
+		self.Tab[0]=float(Quoti["1semaine"][0].strip("%"))/100
+		self.Tab[1]=float(Quoti["1mois"][0].strip("%"))/100
+		self.Tab[2]=float(Quoti["3mois"][0].strip("%"))/100
+		self.Tab[3]=float(Quoti["6mois"][0].strip("%"))/100
+		self.Tab[4]=float(Quoti["1an"][0].strip("%"))/100
 		_3ans=Quoti["3ans"][0].strip("%")
 		if (_3ans != '-'):
-			self.Tab[5]=float(_3ans)
+			self.Tab[5]=float(_3ans)/100
 		_5ans=Quoti["5ans"][0].strip("%")
 		if (_5ans != '-'):
-			self.Tab[6]=float(_5ans)
+			self.Tab[6]=float(_5ans)/100
 		_10ans=Quoti["10ans"][0].strip("%")
 		if (_10ans != '-'):
-			self.Tab[7]=float(_10ans)
+			self.Tab[7]=float(_10ans)/100
 		
 		#Plus tard ajout des NM ... 
 		#self.Tab[0]=Quoti["MM20"]
@@ -56,13 +57,13 @@ class Action():
 	
 	def Maj1min(self,heure):
 		val=self.Journee.get(heure)
-		if (val != None):
-			self.Tab.insert(NBInfoSupplementaire,val)
-			self.Tab=self.Tab[0:-1]
-		else : # SI on est égale a none on ajout la derniere valeurs L'enregistrement des valeurs a commencé plus tard
-			val=self.Tab[NBInfoSupplementaire+1]
-			self.Tab.insert(NBInfoSupplementaire,val)
-			self.Tab=self.Tab[0:-1]
+		while (val == None):			
+			heure = minute[minute.index(heure)+1]
+			val=self.Journee.get(heure)
+		self.Tab.insert(NBInfoSupplementaire,val/self.valref)
+		self.Tab=self.Tab[0:-1]
+		
+			
 
 	def getTable(self):
 		return self.Tab

Src/RDN.py

@@ -2,9 +2,10 @@
 
 from define import *
 import math
-#import numpy
 
 def mult(Addresse,Neuronne, poids):
+
+	
 	res = Neuronne[Addresse[0]] * \
 	Neuronne[Addresse[1]] * \
 	Neuronne[Addresse[2]] * \
@@ -36,11 +37,11 @@ def mult(Addresse,Neuronne, poids):
 	Neuronne[Addresse[28]] * \
 	Neuronne[Addresse[29]] * \
 	Neuronne[Addresse[30]] * \
-	poids 
-	print ("res1 : " + str(res))
+	poids
+	
 	
 	res = 1.7159*math.atan( 0.66666667*(res))
-	print ("res2 : " + str(res))
+	print (res)
 	return res
 	
 
@@ -125,16 +126,12 @@ class RDN():
 		for i in range(len(self.C2)):
 			self.C2[i]=mult(self.add2[i],self.C1,self.poid2[i])
 		
-		
 		# ~ for i in range(len(self.C3)):
 			# ~ self.C3[i]=mult(self.add3[i],self.C2,self.poid3[i])
 			
-		
 		# ~ for i in range(len(self.C4)):
 			# ~ self.C4[i]=mult(self.add4[i],self.C3,self.poid4[i])
 			
 		# ~ for i in range(len(self.C5)):
 			# ~ self.C5[i]=mult(self.add5[i],self.C4,self.poid5[i])
-		# ~ print (self.C5)
-		print (self.C2[NBC2-10])
 		return self.C5

Src/define.py

@@ -29,5 +29,5 @@ minute = [
 "17h00", "17h01", "17h02", "17h03", "17h04", "17h05", "17h06", "17h07", "17h08", "17h09", "17h10", "17h11", "17h12", "17h13","17h14", "17h15", "17h16", "17h17", "17h18", "17h19", "17h20", "17h21", "17h22", "17h23", "17h24", "17h25", "17h26", "17h27", "17h28", "17h29", "17h30"]
 
 
-D_file= "C:/Users/rcluze/Documents/Perso/Projet/DonneBourse/" 
-#"/home/remy/Projet/DonneBourse/" #dossier des files
+D_file= "/home/remy/Projet/DonneBourse/" #dossier des files
+# D_file= "C:/Users/rcluze/Documents/Perso/Projet/DonneBourse/" 

Src/main.py

@@ -8,7 +8,7 @@ Portefeuille = initPortefeuille
 FraisBancaire = 0
 
 print ("debut init  gererate")
-ID = 31#GenerateFile()
+ID = 30#GenerateFile()
 
 RDN=RDN(ID)
 

Src/resume.txt

@@ -1,60 +1,14 @@
-1: +3%
-2: null
-3: null
-4: null
-5: null
-6: null
-7: null
-8: null
-9: null
-10: null
-11: null
-12: null
-13: null
-14: null
-15: null
-16: null
-17: null
-18: null
-19: null
-20: null
-21: null
-22: null
-23: null
-24: null
-25: null
-26: null
-27: null
-28: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
-29: null
+1: test
+30: null
+30: null
+30: null
+30: null
+30: null
+30: null
+30: null
+30: null
+30: null
+30: null
 30: null
 30: null
 30: null
@@ -86,12 +40,3 @@
 30: null
 30: null
 30: null
-31: null
-31: null
-32: null
-31: null
-31: null
-31: null
-31: null
-31: null
-31: null