diff --git a/mopso.py b/mopso.py index ee9f0fc..0198f1a 100644 --- a/mopso.py +++ b/mopso.py @@ -1,5 +1,5 @@ import random as rd -from .particle import Particle +from particle import Particle import copy class MOPSO(): @@ -17,7 +17,7 @@ class MOPSO(): # Initialisation of particle's global parameters self.A_max = A_max # Network's power limit self.socs, self.socs_req = self.generate_state_of_charges(nb_vehicles,nb_of_ticks) - self.times = self.generate_times(nb_vehicles, nb_of_ticks, delta_t) + self.times = self.generate_times(nb_vehicles, nb_of_ticks) self.prices = self.generates_prices(nb_of_ticks,price_mean,price_std) #TODO: Use RTE France prices for random prices generation according to number of ticks self.capacities = capacities @@ -83,7 +83,7 @@ class MOPSO(): def generates_prices(self,nb_of_ticks:int, mean:float, std:float): prices = [] for _ in range(nb_of_ticks): - variation = rd.randrange(-(std*10), (std * 10) +1, 1) / 10 # Random float variation + variation = rd.uniform(-std, std) # Random float variation prices.append(mean + variation) return prices