quantproject-developers

[Marco M. <mi...@us...>]

Update of /cvsroot/quantproject/QuantProject/b1_ADT/Histories
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17521/b1_ADT/Histories

Modified Files:
	History.cs 
Log Message:
Just for conflict resolution

Index: History.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/Histories/History.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** History.cs	18 Jun 2006 14:22:14 -0000	1.9
--- History.cs	18 Jun 2006 15:28:11 -0000	1.10
***************
*** 204,210 ****
  			{
  			  
! 				if ( Math.Floor( Convert.ToDouble(
! 					currentHistoryIndex / onEachPeriodOf ) ) == periodIndex &&
! 					cursorThroughDataArray < onEachPeriodOf )
  					//currentHistoryIndex belongs to the current period
  				{	
--- 204,211 ----
  			{
  			  
! 
! 				if (Math.Floor(Convert.ToDouble(currentHistoryIndex/onEachPeriodOf)) == periodIndex &&
! 					cursorThroughDataArray < onEachPeriodOf)
! 
  					//currentHistoryIndex belongs to the current period
  				{	
***************
*** 235,240 ****
  					}
  				}
! 				periodIndex = Math.Floor( Convert.ToDouble(
! 					currentHistoryIndex/onEachPeriodOf ) );
  			}
  
--- 236,242 ----
  					}
  				}
! 
! 				periodIndex = Math.Floor(Convert.ToDouble(currentHistoryIndex/onEachPeriodOf));
! 
  			}