- use Valuechanged mechanism

components/actor/heater.py

@@ -3,14 +3,9 @@ from components.aheater import AHeater
 
 class Heater(AHeater):
 	def __init__(self):
-		self.power = self.get_power_min()
-		self.power_last = -1
+		self.power_set = self.get_power_min()
 		self.is_active = False
-
-		self.power_changed_callback = None
-
-	def connect_power_changed(self, func):
-		self.power_changed_callback = func
+		self.power_eff = 0
 
 	def get_power_min(self):
 		return 500
@@ -22,18 +17,12 @@ class Heater(AHeater):
 		self.is_active = enable
 
 	def process(self):
-		if self.getPower() != self.power_last:
-			if self.power_changed_callback is not None:
-				self.power_changed_callback(self.getPower())
-		self.power_last = self.getPower()
+		self.power_eff = self.power_set if self.is_active else 0
 
 	def setPower(self, power):
-		self.power = max(self.get_power_min(), min(self.get_power_max(), power))
+		self.power_set = max(self.get_power_min(), min(self.get_power_max(), power))
 
 	def getPower(self):
-		if self.is_active:
-			return self.power
-		else:
-			return 0
+		return self.power_eff
 
 

components/aheater.py

@@ -1,10 +1,8 @@
 import abc
+from utils.value import AttributeChange
 
 
-class AHeater:
-	def __init__(self):
-		pass
-
+class AHeater(AttributeChange):
 	@abc.abstractmethod
 	def get_power_min(self):
 		pass
@@ -28,7 +26,3 @@ class AHeater:
 	@abc.abstractmethod
 	def getPower(self):
 		return None
-
-	@abc.abstractmethod
-	def connect_power_changed(self, func):
-		pass

components/aplant.py

@@ -1,10 +1,8 @@
 import abc
+from utils.value import AttributeChange
 
 
-class APlant:
-	def __init__(self, params):
-		pass
-
+class APlant(AttributeChange):
 	@abc.abstractmethod
 	def activate(self, enable):
 		return None
@@ -14,7 +12,7 @@ class APlant:
 		pass
 
 	@abc.abstractmethod
-	def setPower(self, power_W):
+	def setPower(self, power):
 		pass
 
 	@abc.abstractmethod
@@ -24,7 +22,3 @@ class APlant:
 	@abc.abstractmethod
 	def getTemperature(self):
 		return None
-
-	@abc.abstractmethod
-	def connect_theta_changed(self, func):
-		pass

components/plant/pot.py

@@ -1,5 +1,4 @@
 import numpy as np
-import json
 from components.aplant import APlant
 
 
@@ -20,17 +19,13 @@ class Pot(APlant):
 		self.theta_amb = params['theta_amb']
 
 		self.theta = 0
-
+		self.temp = self.theta_amb
 		self.alpha = self.dt / 1
 		self.alpha_delay = self.dt/self.Td
 
-		self.theta_changed_callback = None
 		self.power_set = 0
 		self.power_actual = 0
 
-	def connect_theta_changed(self, func):
-		self.theta_changed_callback = func
-
 	def activate(self, enable):
 		pass
 
@@ -41,12 +36,9 @@ class Pot(APlant):
 		self.e = self.e * (1 - ((self.L * self.theta) * self.dt) / (self.M * self.C))
 		self.x = (1 - self.alpha) * self.x + self.gain * self.alpha * self.power_actual
 		self.e += self.x
-		theta = self.e / (self.M * self.C)
+		self.theta = self.e / (self.M * self.C)
 
-		if self.theta_changed_callback is not None:
-			self.theta_changed_callback(self.getTemperature())
-
-		self.theta = theta
+		self.temp = self.getTemperature()
 
 	def setPower(self, power):
 		self.power_set = power