Commit f6f0982b authored by Ozmen O's avatar Ozmen O
Browse files

--amend

parent 58833535

testOpt/FMUModel.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ class FMUModel: 
				strs << get_storage1_Prated();

                                str = strs.str();

	                        str = str+"\n";

				cout<<"GGAGAG "<<str<<endl;

			}

			char* buffer = new char[str.length()];

			strcpy(buffer, str.c_str());

testOpt/FMUModelC.txt

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ class FMUModel: 
				strs << get_storage1_Prated();

                                str = strs.str();

	                        str = str+"\n";

				cout<<"GGAGAG "<<str<<endl;

			}

			char* buffer = new char[str.length()];

			strcpy(buffer, str.c_str());

testOpt/network.cpp

+5 −5
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class x86: 
					//cout<<" PORT "<<port<<endl;

					s.erase(0,pos1 + mes_sep.length());// Erase the first message from the byte stream

					//token1=token1+"\n";

					cout<<"MESSAGE: "<<token1;

					//cout<<"MESSAGE: "<<token1;

					char* mes = new char [token1.size()]; // Create cahr for the whole message

					memcpy(mes,token1.c_str(),token1.size());

					//strcpy(mes, token1.c_str()); // Make char byte stream
@@ -157,9 +157,9 @@ int main() 
	// The number of ISOs

	int numISO = 1;

	// The number of Utilities

	int numUtil = 2;

	int numUtil = 1;

	// The number of Aggregators

	int numAgg = 4;

	int numAgg = 1;

	// The number of Homes

	int numLoad = numComputers;

	// The number of WebAPI ISOs
@@ -448,7 +448,7 @@ int main() 
	cout<<"TIME";

	for(int i = 0; i<numComputers;i++){



		cout<<"	ROOM-"<<i<<"	WH-"<<i<<"	MODE-HVAC"<<"	SETPOINT-HVAC"<<"	MODE-WH"<<"	SETPOINT-WH";

		cout<<"	Home_RoomT-"<<i<<"	Home_WallT-"<<i<<"	Home_AtticT-"<<"	Home_RoofT-"<<i<<"	Home_heatLoads-"<<i<<"	WH_T-"<<i<<"	WH_HW_consumption-"<<i<<"	MODE-WH-"<<i<<"	SETPOINTWH-"<<i<<"	SETPOINTHVAC-"<<i<<"	MODE-HVAC-"<<i<<"	CapacityReduce-"<<i<<"	ChargeRequest-"<<i<<"	Pgrid-"<<i<<"	Pwh-"<<i<<"	Phvac-"<<i<<"	ppv-"<<i;

	}

	cout<<endl;

	// Run simulations
@@ -467,7 +467,7 @@ int main() 
			cout<<sim->nextEventTime();

			for(int i = 0; i<numComputers;i++){



				cout<<" "<<worlds[i]->get_home1_y()<<"	"<<worlds[i]->get_wh1_T()<<"	"<<worlds[i]->get_hvac1_On_y()<<" "<<worlds[i]->get_hvac1_Setpoint_k()<<"	"<<worlds[i]->get_wh1_bup_y()<<"	"<<worlds[i]->get_wh1_Setpoint1_k();

				cout<<" "<<worlds[i]->get_home1_x1()<<" "<<worlds[i]->get_home1_x2()<<" "<<worlds[i]->get_home1_x3()<<" "<<worlds[i]->get_home1_x4()<<" "<<worlds[i]->get_home1_heatLoads()<<" "<<worlds[i]->get_wh1_T()<<" "<<worlds[i]->get_wh1_w_consumption()<<" "<<worlds[i]->get_wh1_bup_y()<<" "<<worlds[i]->get_wh1_Setpoint1_k()<<" "<<worlds[i]->get_hvac1_Setpoint_k()<<"	"<<worlds[i]->get_hvac1_On_y()<<"	"<<worlds[i]->get_storage1_capacityReduce()<<"	"<<worlds[i]->get_storage1_ChargeRequest_k()<<"	"<<worlds[i]->get_storage1_Pgrid()<<"	"<<worlds[i]->get_storage1_Pwh()<<"	"<<worlds[i]->get_storage1_Phvac()<<"	"<<worlds[i]->get_storage1_ppv();

			}

			cout<<endl;

			tReport++;

testOpt/test_transactive

+2.27 KiB (1.1 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file