#34 completed testing of lbfgs

Author: ajaykumarsampath

src/Engine.cu

@@ -41,11 +41,11 @@ Engine::Engine(DwnNetwork *myNetwork, ScenarioTree *myScenarioTree, SmpcConfigur
 	priceUncertaintyFlag = true;
 	demandUncertaintyFlag = true;
 	if( algorithmName.compare("globalFbeAlgorithm") == 0){
-		cout << " algorithm based on SMPC " << algorithmName <<endl;
+		cout << "algorithm based on SMPC " << algorithmName <<endl;
 		globalFbeFlag = true;
 
 	}else{
-		cout << " algorithm based on SMPC " << algorithmName <<endl;
+		cout << "algorithm based on SMPC " << algorithmName <<endl;
 		globalFbeFlag = false;
 	}
 

src/SmpcController.cu

@@ -50,6 +50,7 @@ SmpcController::SmpcController(Forecaster *myForecaster, Engine *myEngine, SmpcC
 
 	vecPrimalInfs = new real_t[ptrMySmpcConfig->getMaxIterations()];
 	vecValueFbe = new real_t[ptrMySmpcConfig->getMaxIterations()];
+	vecTau = new real_t[ptrMySmpcConfig->getMaxIterations()];
 
 	economicKpi = 0;
 	smoothKpi = 0;
@@ -81,6 +82,7 @@ SmpcController::SmpcController(string pathToConfigFile){
 
 	vecPrimalInfs = new real_t[ptrMySmpcConfig->getMaxIterations()];
 	vecValueFbe = new real_t[ptrMySmpcConfig->getMaxIterations()];
+	vecTau = new real_t[ptrMySmpcConfig->getMaxIterations()];
 
 	economicKpi = 0;
 	smoothKpi = 0;
@@ -1688,4 +1690,5 @@ SmpcController::~SmpcController(){
 
 	vecPrimalInfs = NULL;
 	vecValueFbe = NULL;
+	vecTau = NULL;
 }

src/main.cu

@@ -12,12 +12,14 @@ int main(void){
 	uint_t TESTING = 1;
 	if (TESTING){
 		Testing *myTesting = new Testing();
-		//_ASSERT( myTesting->testNetwork() );
-		//_ASSERT( myTesting->testScenarioTree() );
-		//_ASSERT( myTesting->testForecaster() );
-		//_ASSERT( myTesting->testControllerConfig() );
-		//_ASSERT( myTesting->testEngineTesting() );
-		//_ASSERT( myTesting->testSmpcController() );
+		_ASSERT( myTesting->testNetwork() );
+		_ASSERT( myTesting->testScenarioTree() );
+		_ASSERT( myTesting->testForecaster() );
+		_ASSERT( myTesting->testControllerConfig() );
+		_ASSERT( myTesting->testEngineTesting() );
+		_ASSERT( myTesting->testSmpcController() );
+		//Testing *otherTesting = new Testing();
+		//_ASSERT( otherTesting->testSmpcFbeController() );
 		_ASSERT( myTesting->testSmpcFbeController() );
 		//myTesting->testNewEngineTesting();
 	}else{

src/test/Testing.cu

@@ -509,7 +509,7 @@ uint_t Testing::testSmpcController(){
 	_ASSERT( ptrMyTestSmpc->testProximalStep());
 	_ASSERT( ptrMyTestSmpc->testDualUpdate() );
 
-	cout << "completed testing of the controller" << endl;
+	cout << "completed testing of the APG controller" << endl;
 	delete ptrMyDwnNetwork;
 	delete ptrMyScenarioTree;
 	delete ptrMySmpcConfig;
@@ -518,6 +518,11 @@ uint_t Testing::testSmpcController(){
 	delete ptrMyTestSmpc;
 	ptrMyDwnNetwork = NULL;
 	ptrMyScenarioTree = NULL;
+	ptrMySmpcConfig = NULL;
+	ptrMyForecaster = NULL;
+	ptrMySmpcConfig = NULL;
+	ptrMyTestSmpc = NULL;
+
 
 	delete [] y;
 	return 1;
@@ -546,6 +551,8 @@ uint_t Testing::testSmpcFbeController(){
 
 	cout << "completed testing global FBE algorithm in smpc" << endl;
 	delete ptrMyForecaster;
+	delete ptrMyTestSmpc;
+	ptrMyTestSmpc = NULL;
 	ptrMyForecaster = NULL;
 
 	return 1;