[Quantproject-developers] QuantProject/b1_ADT/Optimizing/BruteForce BruteForceOptimizer.cs, 1.4, 1.5

[Glauco S. <gla...@us...>]

Update of /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/BruteForce
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2577/b1_ADT/Optimizing/BruteForce

Modified Files:
	BruteForceOptimizer.cs 
Log Message:
- an IBruteForceOptimizableParametersManager is now given to the TopBestParametersManager, to avoid adding equivalent parameters to the TopBestParameters list
- TopBestParameters are now sorted descending, at the end of the Run

Index: BruteForceOptimizer.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/BruteForce/BruteForceOptimizer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BruteForceOptimizer.cs	26 Mar 2008 00:46:38 -0000	1.4
--- BruteForceOptimizer.cs	30 Mar 2008 15:36:44 -0000	1.5
***************
*** 112,121 ****
  		{
  			this.bestParametersManager = new BestParametersManager(
! 				this.numberOfTopBestParameters );
  			this.analizedItems = 0;
  			this.bruteForceOptimizableParametersManager.Reset();
  //			this.bestParameters =
  //				(BruteForceOptimizableParameters)this.bruteForceOptimizableParametersManager.Current;
! 			while( this.bruteForceOptimizableParametersManager.MoveNext() )
  			{
  				BruteForceOptimizableParameters bruteForceOptimizableParameters =
--- 112,122 ----
  		{
  			this.bestParametersManager = new BestParametersManager(
! 				this.numberOfTopBestParameters ,
! 				this.bruteForceOptimizableParametersManager );
  			this.analizedItems = 0;
  			this.bruteForceOptimizableParametersManager.Reset();
  //			this.bestParameters =
  //				(BruteForceOptimizableParameters)this.bruteForceOptimizableParametersManager.Current;
! 			do
  			{
  				BruteForceOptimizableParameters bruteForceOptimizableParameters =
***************
*** 123,127 ****
  				this.bestParametersManager.Analize( bruteForceOptimizableParameters );
  				this.handleProgress();
! 			}
  		}
  		/// <summary>
--- 124,133 ----
  				this.bestParametersManager.Analize( bruteForceOptimizableParameters );
  				this.handleProgress();
! 				
! 			}while (this.bruteForceOptimizableParametersManager.MoveNext());
! 		}
! 		private void sortTopBestParametersDescending()
! 		{
! 			this.bestParametersManager.SortTopBestParametersDescending();
  		}
  		/// <summary>
***************
*** 131,134 ****
--- 137,141 ----
  		{
  			this.createTopBestParameters();
+ 			this.sortTopBestParametersDescending();
  //			this.bestParametersManager.TopBestParameters.Sort();
  			this.runIsComplete = true;