Fix RBSA object creation and initialization (#938)

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
arras-energy · Jul 2, 2021 · b341740 · b341740
1 parent 7218942
commit b341740
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/module/residential/rbsa.cpp b/module/residential/rbsa.cpp
@@ -395,8 +395,25 @@ rbsa::rbsa(MODULE *module)
 
 int rbsa::create(void) 
 {
-
-	memcpy((void*)this,defaults,sizeof(*this));
+	components = NULL;
+	voltage_A = NULL;
+	voltage_B = NULL;
+	voltage_C = NULL;
+	nominal_voltage = NULL;
+	temperature = NULL;
+	price = NULL;
+	solar = NULL;
+	occupancy = NULL;
+	data = NULL;
+	power_A = NULL;
+	power_B = NULL;
+	power_C = NULL;
+	current_A = NULL;
+	current_B = NULL;
+	current_C = NULL;
+	shunt_A = NULL;
+	shunt_B = NULL;
+	shunt_C = NULL;
 	return 1; 
 }
 

diff --git a/module/residential/rbsa.h b/module/residential/rbsa.h
@@ -103,7 +103,6 @@ class rbsa : public gld_object
 		SENSITIVITY occupancy; // occupancy sensitivity
 		struct s_component *next;
 	} COMPONENT;
-	COMPONENT *components;
 public:
 	COMPONENT *get_first_component();
 	inline COMPONENT *get_next_component(COMPONENT *c);
@@ -144,6 +143,8 @@ class rbsa : public gld_object
 		else
 			warning("unable to link property '%s' in object '%s'",name,get_object(obj)->get_name());
 	}
+private:
+	COMPONENT *components;
 private:
 	complex *voltage_A;
 	complex *voltage_B;