quantproject-developers

[Quantproject-developers] QuantProject/b2_DataAccess/Tables Tickers_tickerGroups.cs,1.4,1.5

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

Update of /cvsroot/quantproject/QuantProject/b2_DataAccess/Tables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22422/b2_DataAccess/Tables

Modified Files:
	Tickers_tickerGroups.cs 
Log Message:
Added Tickers_TickerGroups class to manage tickers inside groups

Index: Tickers_tickerGroups.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b2_DataAccess/Tables/Tickers_tickerGroups.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Tickers_tickerGroups.cs	4 Aug 2004 22:56:29 -0000	1.4
--- Tickers_tickerGroups.cs	5 Sep 2004 13:49:31 -0000	1.5
***************
*** 45,48 ****
--- 45,65 ----
        
      }
+     
+     /// <summary>
+     /// It fills the given dataTable with tickers belonging to a given group
+     /// </summary>
+     /// <param name="groupID">The groupID corresponding to the tickers whose
+     /// values have to be stored in the given Data Table</param>
+     /// <param name="dataTable">The dataTable where to store tickers</param>
+     /// <returns></returns>
+     public static void SetDataTable( string groupID , DataTable dataTable)
+     {
+       string sql;
+       sql = "SELECT " + Tickers_tickerGroups.Ticker + " FROM tickers_tickerGroups " +
+             "WHERE " + Tickers_tickerGroups.GroupID + "='" +
+             groupID + "'";
+       SqlExecutor.SetDataTable( sql , dataTable );
+     }
+ 
      /// <summary>
      /// It provides deletion of the single ticker from the specified group

[Quantproject-developers] QuantProject/b3_Data/DataTables TickerDataTable.cs,1.3,1.4

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataTables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22422/b3_Data/DataTables

Modified Files:
	TickerDataTable.cs 
Log Message:
Added Tickers_TickerGroups class to manage tickers inside groups

Index: TickerDataTable.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/DataTables/TickerDataTable.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TickerDataTable.cs	25 Jul 2004 12:08:53 -0000	1.3
--- TickerDataTable.cs	5 Sep 2004 13:49:31 -0000	1.4
***************
*** 64,68 ****
                                                        long maxNumOfReturnedTickers)
      {
!       DataTable groupOfTicker = Tickers_tickerGroups.GetTickers(groupID);
        //also possible, but slower:
        //return TickerDataTable.GetBestPerformingTickers(orderByASC, groupOfTicker, firstQuoteDate,
--- 64,68 ----
                                                        long maxNumOfReturnedTickers)
      {
!       DataTable groupOfTicker = QuantProject.DataAccess.Tables.Tickers_tickerGroups.GetTickers(groupID);
        //also possible, but slower:
        //return TickerDataTable.GetBestPerformingTickers(orderByASC, groupOfTicker, firstQuoteDate,

[Quantproject-developers] QuantProject/b3_Data b3_Data.csproj,1.12,1.13

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

Update of /cvsroot/quantproject/QuantProject/b3_Data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22422/b3_Data

Modified Files:
	b3_Data.csproj 
Log Message:
Added Tickers_TickerGroups class to manage tickers inside groups

Index: b3_Data.csproj
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/b3_Data.csproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** b3_Data.csproj	28 Aug 2004 17:27:58 -0000	1.12
--- b3_Data.csproj	5 Sep 2004 13:49:32 -0000	1.13
***************
*** 125,136 ****
                      WrapperTool = "primary"
                  />
-                 <Reference
-                     Name = "Microsoft.Office.Core"
-                     Guid = "{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}"
-                     VersionMajor = "2"
-                     VersionMinor = "3"
-                     Lcid = "0"
-                     WrapperTool = "primary"
-                 />
              </References>
          </Build>
--- 125,128 ----
***************
*** 213,216 ****
--- 205,218 ----
                  />
                  <File
+                     RelPath = "DataTables\Tickers_tickerGroups.cs"
+                     SubType = "Component"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataTables\Tickers_tickerGroups.resx"
+                     DependentUpon = "Tickers_tickerGroups.cs"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "DataTables\ValidatedTickers.cs"
                      SubType = "Component"

[Quantproject-developers] QuantProject/b3_Data/DataTables Tickers_tickerGroups.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataTables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22252/b3_Data/DataTables

Added Files:
	Tickers_tickerGroups.cs 
Log Message:
Added Tickers_TickerGroups class to manage tickers inside groups

--- NEW FILE: Tickers_tickerGroups.cs ---
/*
QuantDownloader - Quantitative Finance Library

Tickers_tickerGroups.cs
Copyright (C) 2003 
Marco Milletti

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/

using System;
using System.Data;
using QuantProject.ADT;
using QuantProject.DataAccess.Tables;

namespace QuantProject.Data.DataTables
{
	/// <summary>
	/// The DataTable to work with tickers inside a given group.
	/// </summary>
	
  public class Tickers_tickerGroups : DataTable
	{
    // these static fields provide field name in the database table
    // They are intended to be used through intellisense when necessary
    public static string GroupID = "ttTgId";
    public static string Ticker = "ttTiId";
        
    public Tickers_tickerGroups(string groupID)
    {
      this.fillDataTable(groupID);
    }
    
    private void fillDataTable( string groupID )
    {
      QuantProject.DataAccess.Tables.Tickers_tickerGroups.SetDataTable(groupID, this);

    }
       
  }
}

[Quantproject-developers] QuantProject/b7_Scripts/TickerSelectionTesting - New directory

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

Update of /cvsroot/quantproject/QuantProject/b7_Scripts/TickerSelectionTesting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21792/TickerSelectionTesting

Log Message:
Directory /cvsroot/quantproject/QuantProject/b7_Scripts/TickerSelectionTesting added to the repository

[Quantproject-developers] QuantDownloader QuantDownloader.suo,1.20,1.21

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

Update of /cvsroot/quantproject/QuantDownloader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11553

Modified Files:
	QuantDownloader.suo 
Log Message:
no message

Index: QuantDownloader.suo
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/QuantDownloader.suo,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
Binary files /tmp/cvsh8nrXO and /tmp/cvsJY1GcD differ

[Quantproject-developers] QuantProject QuantProject.suo,1.37,1.38

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

Update of /cvsroot/quantproject/QuantProject
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11438

Modified Files:
	QuantProject.suo 
Log Message:
no message

Index: QuantProject.suo
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/QuantProject.suo,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
Binary files /tmp/cvslJTFEf and /tmp/cvs9fEgpI differ

[Quantproject-developers] QuantProject/b7_Scripts b7_Scripts.csproj,1.10,1.11

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

Update of /cvsroot/quantproject/QuantProject/b7_Scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/b7_Scripts

Modified Files:
	b7_Scripts.csproj 
Log Message:
Added:
- WalkForwardTesting\WalkForwardOneRank\DataStreamerHandler.cs
- WalkForwardTesting\WalkForwardOneRank\RunWalkForwardOneRank.cs

Index: b7_Scripts.csproj
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b7_Scripts/b7_Scripts.csproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** b7_Scripts.csproj	1 Aug 2004 00:44:24 -0000	1.10
--- b7_Scripts.csproj	28 Aug 2004 17:30:30 -0000	1.11
***************
*** 93,96 ****
--- 93,101 ----
                      HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Windows.Forms.dll"
                  />
+                 <Reference
+                     Name = "b3_Data"
+                     Project = "{6AC0A2C1-B926-4921-A685-F5AA80E81C94}"
+                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                 />
              </References>
          </Build>
***************
*** 172,175 ****
--- 177,190 ----
                      BuildAction = "Compile"
                  />
+                 <File
+                     RelPath = "WalkForwardTesting\WalkForwardOneRank\DataStreamerHandler.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "WalkForwardTesting\WalkForwardOneRank\RunWalkForwardOneRank.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
              </Include>
          </Files>

[Quantproject-developers] QuantProject/b3_Data b3_Data.csproj,1.11,1.12

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

Update of /cvsroot/quantproject/QuantProject/b3_Data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10941/b3_Data

Modified Files:
	b3_Data.csproj 
Log Message:
Added:
- HistoricalDataStreamer.cs
- IDataStreamer.cs
- NewExtendedDateTimeEventArgs.cs
- NewQuoteEventArgs.cs
- Quote.cs
- Timer.cs

Index: b3_Data.csproj
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/b3_Data.csproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** b3_Data.csproj	23 Aug 2004 22:37:52 -0000	1.11
--- b3_Data.csproj	28 Aug 2004 17:27:58 -0000	1.12
***************
*** 158,161 ****
--- 158,191 ----
                  />
                  <File
+                     RelPath = "DataProviders\HistoricalDataStreamer.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataProviders\IDataStreamer.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataProviders\NewExtendedDateTimeEventArgs.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataProviders\NewQuoteEventArgs.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataProviders\Quote.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "DataProviders\Timer.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "DataTables\GroupQuotes.cs"
                      SubType = "Component"
***************
*** 163,166 ****
--- 193,201 ----
                  />
                  <File
+                     RelPath = "DataTables\GroupQuotes.resx"
+                     DependentUpon = "GroupQuotes.cs"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "DataTables\Quotes.cs"
                      SubType = "Component"

[Quantproject-developers] QuantProject/b3_Data/DataProviders HistoricalDataProvider.cs,1.1,1.2

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10451/b3_Data/DataProviders

Modified Files:
	HistoricalDataProvider.cs 
Log Message:
Added the GetQuotes method, to return
the hashtable containing, for each ticker, the
quote for the given extended date time


Index: HistoricalDataProvider.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/DataProviders/HistoricalDataProvider.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HistoricalDataProvider.cs	23 Aug 2004 22:33:57 -0000	1.1
--- HistoricalDataProvider.cs	28 Aug 2004 17:24:57 -0000	1.2
***************
*** 145,148 ****
--- 145,181 ----
  			return Quotes.GetTickerQuotes( instrumentKey );
  		}
+ 		#region GetQuotes
+ 		private static double getQuotes_getQuoteValue( DataRow dataRow , ExtendedDateTime extendedDateTime )
+ 		{
+ 			double returnValue;
+ 			/// TO DO: evaluate to use a Quote class, that derives from the DataRow class
+ 			/// and use properties instead of dataRow accessing
+ 			if ( extendedDateTime.BarComponent == BarComponent.Open )
+ 				returnValue = (double)dataRow[ QuantProject.Data.DataTables.Quotes.Open ] *
+ 					(double)dataRow[ QuantProject.Data.DataTables.Quotes.AdjustedClose ] /
+ 					(double)dataRow[ QuantProject.Data.DataTables.Quotes.Close ];
+ 			else
+ 				returnValue = (double)dataRow[ QuantProject.Data.DataTables.Quotes.AdjustedClose ];
+ 			return returnValue;
+ 		}
+ 		/// <summary>
+ 		/// Returns the hashtable containing, for each ticker, the
+ 		/// quote for the given extended date time
+ 		/// </summary>
+ 		/// <param name="tickerCollection">List of tickers whose quotes are to be fetched</param>
+ 		/// <param name="extendedDateTime"></param>
+ 		/// <returns></returns>
+ 		public static Hashtable GetQuotes( ICollection tickerCollection ,
+ 			ExtendedDateTime extendedDateTime )
+ 		{
+ 			Hashtable returnValue = new Hashtable();
+ 			QuantProject.Data.DataTables.Quotes quotes =
+ 				new QuantProject.Data.DataTables.Quotes( tickerCollection ,extendedDateTime.DateTime );
+ 			foreach (DataRow dataRow in quotes.Rows)
+ 				returnValue.Add( dataRow[ QuantProject.Data.DataTables.Quotes.TickerFieldName ] ,
+ 					getQuotes_getQuoteValue( dataRow , extendedDateTime ) );
+ 			return returnValue;
+ 		}
+ 		#endregion
  	}
  }

[Quantproject-developers] QuantProject/b3_Data/DataTables Quotes.cs,1.8,1.9

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataTables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9074/b3_Data/DataTables

Modified Files:
	Quotes.cs 
Log Message:
The constructor has been overloaded,
to build a Quotes data table
containing a row for each ticker in a given collection,
with the quotes for the given DateTime.
Preexisting two constructors have been moved to the
begin of the file.

Index: Quotes.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/DataTables/Quotes.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Quotes.cs	22 Aug 2004 16:56:25 -0000	1.8
--- Quotes.cs	28 Aug 2004 17:18:06 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.Collections;
  using System.Data;
  using System.Text;
***************
*** 25,28 ****
--- 26,64 ----
  		public static string AdjustedCloseToCloseRatio = "quAdjustedCloseToCloseRatio";
  
+ 		/// <summary>
+ 		/// Builds a Quotes data table containing a row for each ticker in the
+ 		/// collection, with the quotes for the given DateTime
+ 		/// </summary>
+ 		/// <param name="tickerCollection">Tickers whose quotes are to be fetched</param>
+ 		/// <param name="dateTime">Date for the quotes to be fetched</param>
+ 		public Quotes( ICollection tickerCollection , DateTime dateTime )
+ 		{
+ 			QuantProject.DataAccess.Tables.Quotes.SetDataTable( 
+ 				tickerCollection , dateTime , this );
+ 		}
+ 		public Quotes( string ticker , DateTime startDate , DateTime endDate )
+ 		{
+ 			this.fillDataTable( ticker , startDate , endDate );
+ 		}
+ 		public Quotes( string ticker )
+ 		{
+ 			this.fillDataTable( 
+ 				ticker ,
+ 				QuantProject.DataAccess.Tables.Quotes.GetStartDate( ticker ) ,
+ 				QuantProject.DataAccess.Tables.Quotes.GetEndDate( ticker ) );
+ 		}
+ 		private void fillDataTable( string ticker , DateTime startDate , DateTime endDate )
+ 		{
+ 			QuantProject.DataAccess.Tables.Quotes.SetDataTable( 
+ 				ticker , startDate , endDate , this );
+ 			this.setPrimaryKeys(); 
+ 		}
+ 		private void setPrimaryKeys()
+ 		{
+ 			DataColumn[] columnPrimaryKeys = new DataColumn[1];
+ 			columnPrimaryKeys[0] = this.Columns[Quotes.Date];
+ 			this.PrimaryKey = columnPrimaryKeys;
+ 		}
+ 
      /// <summary>
      /// returns most liquid tickers within the given set of tickers
***************
*** 274,302 ****
      }
       
-     private void setPrimaryKeys()
-     {
-       DataColumn[] columnPrimaryKeys = new DataColumn[1];
-       columnPrimaryKeys[0] = this.Columns[Quotes.Date];
-       this.PrimaryKey = columnPrimaryKeys;
-     }
-     
- 
- 		private void fillDataTable( string ticker , DateTime startDate , DateTime endDate )
- 		{
- 			QuantProject.DataAccess.Tables.Quotes.SetDataTable( 
- 				ticker , startDate , endDate , this );
-       this.setPrimaryKeys(); 
- 		}
- 		public Quotes( string ticker , DateTime startDate , DateTime endDate )
- 		{
- 			this.fillDataTable( ticker , startDate , endDate );
- 		}
- 		public Quotes( string ticker )
- 		{
- 			this.fillDataTable( 
- 				ticker ,
- 				QuantProject.DataAccess.Tables.Quotes.GetStartDate( ticker ) ,
- 				QuantProject.DataAccess.Tables.Quotes.GetEndDate( ticker ) );
- 		}
  		#region GetHashValue
  		private string getHashValue_getQuoteString_getRowString_getSingleValueString( Object value )
--- 310,313 ----

[Quantproject-developers] QuantProject/b2_DataAccess/Tables Quotes.cs,1.17,1.18

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

Update of /cvsroot/quantproject/QuantProject/b2_DataAccess/Tables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8254/b2_DataAccess/Tables

Modified Files:
	Quotes.cs 
Log Message:
The method SetDataTable has been overloaded,
to builda a Quotes data table
containing a row for each ticker in a given collection,
with the quotes for the given DateTime

Index: Quotes.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b2_DataAccess/Tables/Quotes.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Quotes.cs	22 Aug 2004 16:56:25 -0000	1.17
--- Quotes.cs	28 Aug 2004 17:13:55 -0000	1.18
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.Collections;
  using System.Data;
  using System.Text;
***************
*** 756,776 ****
  		{
  			string sql;
!       if(Tickers_tickerGroups.HasTickers(tickerOrGroupID))
! 			  sql =	"select * from quotes INNER JOIN tickers_tickerGroups ON " +
!               "quotes." + Quotes.TickerFieldName + "=tickers_tickerGroups." + Tickers_tickerGroups.Ticker + " " +
! 				      "where " + Tickers_tickerGroups.GroupID + "='" + tickerOrGroupID + "' " +
!               "and " + Quotes.Date + ">=" + SQLBuilder.GetDateConstant( startDate ) + " " +
!               "and " + Quotes.Date + "<=" + SQLBuilder.GetDateConstant( endDate ) + " " +
! 				      "order by " + Quotes.Date;
!       else
!         sql =	"select * from quotes " +
!               "where " + Quotes.TickerFieldName + "='" + tickerOrGroupID + "' " +
!               "and " + Quotes.Date + ">=" + SQLBuilder.GetDateConstant( startDate ) + " " +
!               "and " + Quotes.Date + "<=" + SQLBuilder.GetDateConstant( endDate ) + " " +
!               "order by " + Quotes.Date;
  			
!       SqlExecutor.SetDataTable( sql , dataTable );
  		}
  
  
  
--- 757,815 ----
  		{
  			string sql;
! 			if(Tickers_tickerGroups.HasTickers(tickerOrGroupID))
! 				sql =	"select * from quotes INNER JOIN tickers_tickerGroups ON " +
! 					"quotes." + Quotes.TickerFieldName + "=tickers_tickerGroups." + Tickers_tickerGroups.Ticker + " " +
! 					"where " + Tickers_tickerGroups.GroupID + "='" + tickerOrGroupID + "' " +
! 					"and " + Quotes.Date + ">=" + SQLBuilder.GetDateConstant( startDate ) + " " +
! 					"and " + Quotes.Date + "<=" + SQLBuilder.GetDateConstant( endDate ) + " " +
! 					"order by " + Quotes.Date;
! 			else
! 				sql =	"select * from quotes " +
! 					"where " + Quotes.TickerFieldName + "='" + tickerOrGroupID + "' " +
! 					"and " + Quotes.Date + ">=" + SQLBuilder.GetDateConstant( startDate ) + " " +
! 					"and " + Quotes.Date + "<=" + SQLBuilder.GetDateConstant( endDate ) + " " +
! 					"order by " + Quotes.Date;
  			
! 			SqlExecutor.SetDataTable( sql , dataTable );
  		}
  
+ 		#region SetDataTable for tickerList
+ 		private static string setDataTable_getTickerListWhereClause_getSingleTickerWhereClause(
+ 			string ticker )
+ 		{
+ 			return "(" + Quotes.TickerFieldName + "='" + ticker + "')";
+ 		}
+ 		private static string setDataTable_getTickerListWhereClause( ICollection tickerCollection )
+ 		{
+ 			string returnValue = "";
+ 			foreach (string ticker in tickerCollection)
+ 				if ( returnValue == "" )
+ 					// this is the first ticker to handle
+ 					returnValue += setDataTable_getTickerListWhereClause_getSingleTickerWhereClause( ticker );
+ 				else
+ 					// this is not the first ticker to handle
+ 					returnValue += " or " +
+ 						setDataTable_getTickerListWhereClause_getSingleTickerWhereClause( ticker );
+ 			return "( " + returnValue + " )";
+ 		}
+ 		/// <summary>
+ 		/// Builds a Quotes data table containing a row for each ticker in the
+ 		/// collection, with the quotes for the given DateTime
+ 		/// </summary>
+ 		/// <param name="tickerCollection">Tickers whose quotes are to be fetched</param>
+ 		/// <param name="dateTime">Date for the quotes to be fetched</param>
+ 		/// <param name="dataTable">Output parameter</param>
+ 		public static void SetDataTable( ICollection tickerCollection , DateTime dateTime , DataTable dataTable)
+ 		{
+ 			string sql;
+ 			sql =	"select * from quotes " +
+ 				"where " + setDataTable_getTickerListWhereClause( tickerCollection ) +
+ 				" and " + Quotes.Date + "=" + SQLBuilder.GetDateConstant( dateTime ) + " " +
+ 				"order by " + Quotes.TickerFieldName;
+ 			
+ 			SqlExecutor.SetDataTable( sql , dataTable );
+ 		}
+ 		#endregion
+ 
  
  

[Quantproject-developers] QuantProject/b3_Data/DataProviders NewExtendedDateTimeEventArgs.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7615/b3_Data/DataProviders

Added Files:
	NewExtendedDateTimeEventArgs.cs 
Log Message:
EventArgs for the NewExtendedDateTime event

--- NEW FILE: NewExtendedDateTimeEventArgs.cs ---
/*
QuantProject - Quantitative Finance Library

NewExtendedDateTimeEventArgs.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/
using System;

using QuantProject.ADT;

namespace QuantProject.Data.DataProviders
{
	/// <summary>
	/// EventArgs for the NewExtendedDateTime event
	/// </summary>
	public class NewExtendedDateTimeEventArgs : EventArgs
	{
    private ExtendedDateTime extendedDateTime;

    /// <summary>
    /// The new extended date time
    /// </summary>
    public ExtendedDateTime ExtendedDateTime
    {
      get { return this.extendedDateTime; }
      set { this.extendedDateTime = value; }
    }

    public NewExtendedDateTimeEventArgs( ExtendedDateTime extendedDateTime )
    {
      this.extendedDateTime = extendedDateTime;
    }
  }
}

[Quantproject-developers] QuantProject/b1_ADT ExtendedDateTime.cs,1.1.1.1,1.2

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

Update of /cvsroot/quantproject/QuantProject/b1_ADT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7467/b1_ADT

Modified Files:
	ExtendedDateTime.cs 
Log Message:
Now implements the IComparable interface.
Added the MoveNext method.

Index: ExtendedDateTime.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/ExtendedDateTime.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ExtendedDateTime.cs	13 Oct 2003 21:57:24 -0000	1.1.1.1
--- ExtendedDateTime.cs	28 Aug 2004 17:09:43 -0000	1.2
***************
*** 28,32 ****
  	/// Summary description for DateTime.
  	/// </summary>
!   public class ExtendedDateTime
    {
      private DateTime dateTime;
--- 28,32 ----
  	/// Summary description for DateTime.
  	/// </summary>
!   public class ExtendedDateTime : IComparable
    {
      private DateTime dateTime;
***************
*** 84,87 ****
--- 84,101 ----
      }
  
+ 		/// <summary>
+ 		/// Returns the subsequent ExtendedDateTime
+ 		/// </summary>
+ 		/// <returns></returns>
+ 		public ExtendedDateTime MoveNext()
+ 		{
+ 			ExtendedDateTime returnValue;
+ 			if ( this.barComponent == BarComponent.Open )
+ 				returnValue = new ExtendedDateTime( this.dateTime , BarComponent.Close );
+ 			else
+ 				// this.barComponent == BarComponent.Close
+ 				returnValue = new ExtendedDateTime( this.dateTime.AddDays( 1 ) , BarComponent.Open );
+ 			return returnValue;
+ 		}
      public override string ToString()
      {

[Quantproject-developers] QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank DataStreamerHandler.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7063/b7_Scripts/WalkForwardTesting/WalkForwardOneRank

Added Files:
	DataStreamerHandler.cs 
Log Message:
Implements NewQuoteEventHandler. This is the core strategy!

--- NEW FILE: DataStreamerHandler.cs ---
/*
QuantProject - Quantitative Finance Library

DataStreamerHandler.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/
using System;

using QuantProject.Business.Financial.Accounting;
using QuantProject.Data.DataProviders;

namespace QuantProject.Scripts.WalkForwardTesting.WalkForwardOneRank
{
	/// <summary>
	/// Implements NewQuoteEventHandler. This is the core strategy!
	/// </summary>
	public class DataStreamerHandler
	{
		private Account account;

		public Account Account
		{
			get { return this.account; }
		}
		public DataStreamerHandler()
		{
			this.account = new Account( "Main" );
		}
		public void NewQuoteEventHandler(
			Object sender , NewQuoteEventArgs eventArgs )
		{
		}
	}
}

[Quantproject-developers] QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank RunWalkForwardOneRank.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6707/b7_Scripts/WalkForwardTesting/WalkForwardOneRank

Added Files:
	RunWalkForwardOneRank.cs 
Log Message:
Script to test the One Rank strategy on many tickers,
chosing the best group when a fixed time span has elapsed.

--- NEW FILE: RunWalkForwardOneRank.cs ---
/*
QuantProject - Quantitative Finance Library

RunWalkForwardOneRank.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/

using System;
using System.Collections;
using System.Data;
using QuantProject.ADT;
using QuantProject.Business.Financial.Accounting.Reporting;
using QuantProject.Business.Financial.Instruments;
using QuantProject.Business.Scripting;
using QuantProject.Business.Strategies;
using QuantProject.Business.Testing;
using QuantProject.Data.DataProviders;
using QuantProject.Presentation.Reporting.WindowsForm;

namespace QuantProject.Scripts.WalkForwardTesting.WalkForwardOneRank
{
	/// <summary>
	/// Script to test the One Rank strategy on many tickers, chosing the best group
	/// when a fixed time span has elapsed.
	/// </summary>
	public class RunWalkForwardOneRank : Script
	{
		private string startTicker;
    private ReportTable reportTable;
    private ExtendedDateTime startDateTime;
    private ExtendedDateTime endDateTime;
    private int numIntervalDays;
		private HistoricalDataStreamer historicalDataStreamer;
		private DataStreamerHandler dataStreamerHandler =
			new DataStreamerHandler();

		public RunWalkForwardOneRank()
		{
			this.reportTable = new ReportTable( "Summary_Reports" );
			this.startDateTime = new ExtendedDateTime(
				new DateTime( 2002 , 1 , 1 ) , BarComponent.Open );
			this.endDateTime = new ExtendedDateTime(
				new DateTime( 2002 , 12 , 31 ) , BarComponent.Open );
      this.numIntervalDays = 7;
			this.startTicker = "MSFT";
		}
    #region Run
		private void run_initializeHistoricalDataStreamer()
		{
			this.historicalDataStreamer = new HistoricalDataStreamer();
			this.historicalDataStreamer.StartDateTime = this.startDateTime;
			this.historicalDataStreamer.EndDateTime = this.endDateTime;
			this.historicalDataStreamer.Add( this.startTicker );
		}
    public override void Run()
    {
			Report report;
			run_initializeHistoricalDataStreamer();
			this.historicalDataStreamer.NewQuote +=
				new NewQuoteEventHandler( this.dataStreamerHandler.NewQuoteEventHandler );
			this.historicalDataStreamer.GoSimulate();
			report = new Report( this.dataStreamerHandler.Account );
			report.Show( "WFT One Rank" , this.numIntervalDays , this.startDateTime , "MSFT" );
		}
    #endregion
	}
}

[Quantproject-developers] QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank - New directory

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

Update of /cvsroot/quantproject/QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/WalkForwardOneRank

Log Message:
Directory /cvsroot/quantproject/QuantProject/b7_Scripts/WalkForwardTesting/WalkForwardOneRank added to the repository

[Quantproject-developers] QuantProject/b3_Data/DataProviders Timer.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5619/b3_Data/DataProviders

Added Files:
	Timer.cs 
Log Message:
Simulates the time ticking. Useful for many simulation.

--- NEW FILE: Timer.cs ---
/*
QuantProject - Quantitative Finance Library

Timer.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/
using System;

using QuantProject.ADT;

namespace QuantProject.Data.DataProviders
{
	public delegate void NewExtendedDateTimeHandler(
		Object sender , NewExtendedDateTimeEventArgs eventArgs );
	/// <summary>
	/// Simulates the time ticking
	/// </summary>
	public class Timer
	{

		private ExtendedDateTime startDateTime;
		private ExtendedDateTime endDateTime;
		private ExtendedDateTime currentDateTime;

		public Timer( ExtendedDateTime startDateTime ,
			ExtendedDateTime endDateTime )
		{
			this.startDateTime = startDateTime;
			this.endDateTime = endDateTime;
		}
		public event NewExtendedDateTimeHandler NewExtendedDateTime;

		/// <summary>
		/// Starts the time ticking simulation
		/// </summary>
		public void Start()
		{
			this.currentDateTime = this.startDateTime;
			while ( this.currentDateTime.CompareTo( this.endDateTime ) <= 0 )
			{
				NewExtendedDateTime( this , new NewExtendedDateTimeEventArgs( this.currentDateTime ) );
				this.currentDateTime.MoveNext();
			}
		}
	}
}

[Quantproject-developers] QuantProject/b3_Data/DataProviders NewQuoteEventArgs.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5471/b3_Data/DataProviders

Added Files:
	NewQuoteEventArgs.cs 
Log Message:
EventArgs for the NewQuote event

--- NEW FILE: NewQuoteEventArgs.cs ---
/*
QuantProject - Quantitative Finance Library

NewQuoteEventArgs.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/
using System;
using System.Data;

namespace QuantProject.Data.DataProviders
{
	/// <summary>
	/// EventArgs for the NewQuote event
	/// </summary>
	public class NewQuoteEventArgs : EventArgs
	{
    private Quote quote;

    /// <summary>
    /// The new quote
    /// </summary>
    public Quote Quote
    {
      get { return this.quote; }
      set { this.quote = value; }
    }

    public NewQuoteEventArgs( Quote quote )
    {
      this.quote = quote;
    }
  }
}

[Quantproject-developers] QuantProject/b3_Data/DataProviders Quote.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5354/b3_Data/DataProviders

Added Files:
	Quote.cs 
Log Message:
Single ticker quote. Used by NewQuoteEventArgs

--- NEW FILE: Quote.cs ---
/*
QuantProject - Quantitative Finance Library

Quote.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/

using System;
using QuantProject.ADT;

namespace QuantProject.Data.DataProviders
{
	/// <summary>
	/// Single ticker quote
	/// </summary>
	public class Quote
	{
		private string ticker;
		private double value;
		private ExtendedDateTime extendedDateTime;

		public string Ticker
		{
			get	{	return this.ticker;	}
			set	{	this.ticker = value;	}
		}

		public double Value
		{
			get	{	return this.value;	}
			set	{	this.value = value;	}
		}

		public ExtendedDateTime ExtendedDataTable
		{
			get	{	return this.extendedDateTime;	}
			set	{	this.extendedDateTime = value;	}
		}

		public Quote()
		{
			//
			// TODO: Add constructor logic here
			//
		}
	}
}

[Quantproject-developers] QuantProject/b3_Data/DataProviders HistoricalDataStreamer.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5056/b3_Data/DataProviders

Added Files:
	HistoricalDataStreamer.cs 
Log Message:
IDataStreamer implementation using historical data

--- NEW FILE: HistoricalDataStreamer.cs ---
/*
QuantProject - Quantitative Finance Library

HistoricalDataStreamer.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/
using System;
using System.Collections;

using QuantProject.ADT;

namespace QuantProject.Data.DataProviders
{
	/// <summary>
	/// IDataStreamer implementation using historical data
	/// </summary>
	public class HistoricalDataStreamer : IDataStreamer
	{
		private Hashtable tickers;

		private Timer timer;

		private ExtendedDateTime startDateTime;
		private ExtendedDateTime endDateTime;

		public ExtendedDateTime StartDateTime
		{
			get	{	return this.startDateTime;	}
			set	{	this.startDateTime = value;	}
		}

		public ExtendedDateTime EndDateTime
		{
			get	{	return this.endDateTime;	}
			set	{	this.endDateTime = value;	}
		}

		public HistoricalDataStreamer()
		{
			this.tickers = new Hashtable();
		}

		/// <summary>
		/// Add a ticker whose quotes are to be monitored
		/// </summary>
		/// <param name="ticker"></param>
		public void Add( string ticker )
		{
			if ( !this.tickers.Contains( ticker ) )
				this.tickers.Add( ticker , 1 );
		}

		public event NewQuoteEventHandler NewQuote;

		/// <summary>
		/// Starts the time walking simulation
		/// </summary>
		public void GoSimulate()
		{
			this.timer = new Timer( this.startDateTime , this.endDateTime );
			timer.NewExtendedDateTime += new NewExtendedDateTimeHandler(
				this.newExtendedDateTimeHandler );
			timer.Start();
		}

		private void newExtendedDateTimeHandler(
			Object sender , NewExtendedDateTimeEventArgs eventArgs )
		{
			Hashtable quotes =
				HistoricalDataProvider.GetQuotes( this.tickers , eventArgs.ExtendedDateTime );
      foreach ( Quote quote in quotes )
				this.NewQuote( this , new NewQuoteEventArgs( quote ) );
		}
	}
}

[Quantproject-developers] QuantProject/b3_Data/DataProviders IDataStreamer.cs,NONE,1.1

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/DataProviders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4760/b3_Data/DataProviders

Added Files:
	IDataStreamer.cs 
Log Message:
Interface to be implemented by real time data providers

--- NEW FILE: IDataStreamer.cs ---
/*
QuantProject - Quantitative Finance Library

IDataStreamer.cs
Copyright (C) 2003 
Glauco Siliprandi

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*/

using System;
using System.Data;
using QuantProject.ADT;
using QuantProject.ADT.Histories;
using QuantProject.Data.DataTables;

namespace QuantProject.Data.DataProviders
{
  public delegate void NewQuoteEventHandler(
		Object sender , NewQuoteEventArgs eventArgs );

	/// <summary>
	/// Interface to be implemented by real time data providers
	/// </summary>
	public interface IDataStreamer
	{
    event NewQuoteEventHandler NewQuote;
  }
}

[Quantproject-developers] QuantProject/b3_Data/Selectors TickerSelector.cs,1.8,1.9

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

Update of /cvsroot/quantproject/QuantProject/b3_Data/Selectors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2891/b3_Data/Selectors

Modified Files:
	TickerSelector.cs 
Log Message:
Added method GetCommonTickers, in order to find common tickers in two given tables

Index: TickerSelector.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/Selectors/TickerSelector.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TickerSelector.cs	22 Aug 2004 16:56:26 -0000	1.8
--- TickerSelector.cs	28 Aug 2004 16:41:53 -0000	1.9
***************
*** 22,25 ****
--- 22,26 ----
  
  using System;
+ using System.Collections;
  using System.Data;
  using System.Windows.Forms;
***************
*** 313,316 ****
--- 314,337 ----
      }
  
+     /// <summary>
+     /// It returns a DataTable, with only one column, containing tickers
+     /// that are contained in both the two tables passed as parameters
+     /// </summary>
+     /// <param name="firstDataTable">The first data table in which the column indexed 0 contains the first set of tickers' symbols</param>
+     /// <param name="secondDataTable">The second data table in which the column indexed 0 contains the second set of tickers' symbols</param>
+     public static DataTable GetTableOfCommonTickers(DataTable firstDataTable, DataTable secondDataTable)
+     {
+       DataTable commonTickers = new DataTable();
+       commonTickers.Columns.Add("tiTicker", System.Type.GetType("System.String"));
+       Hashtable hashTable = ExtendedDataTable.GetCommonValues(firstDataTable, 
+                                                               secondDataTable,0,0);
+       object[] values = new object[1];
+       foreach(DictionaryEntry element in hashTable )
+       {
+         values[0]=element.Value;
+         commonTickers.Rows.Add(values);
+       }
+       return commonTickers;
+     }
  
  

[Quantproject-developers] QuantProject/b1_ADT ExtendedDataTable.cs,1.6,1.7

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

Update of /cvsroot/quantproject/QuantProject/b1_ADT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2515/b1_ADT

Modified Files:
	ExtendedDataTable.cs 
Log Message:
Fixed some bugs in GetCommonValues method (now it has been tested and it seems to work)

Index: ExtendedDataTable.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/ExtendedDataTable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExtendedDataTable.cs	22 Aug 2004 16:51:09 -0000	1.6
--- ExtendedDataTable.cs	28 Aug 2004 16:38:32 -0000	1.7
***************
*** 140,159 ****
        string columnNameTable1 = firstDataTable.Columns[indexOfColumnOfFirstTable].ColumnName;
        string columnNameTable2 = firstDataTable.Columns[indexOfColumnOfSecondTable].ColumnName;
!       DataRow[] orderedRowsTable1 = firstDataTable.Select(columnNameTable1 + "!=' '", "DESC");
!       DataRow[] orderedRowsTable2 = secondDataTable.Select(columnNameTable2 + "!=' '", "DESC");
        int j = 0;
        for(int i=0; i != orderedRowsTable1.Length; i++)
        {
!         for(; j != orderedRowsTable2.Length; j++)
          {
            int currentIndex = j;
            object object1 = orderedRowsTable1[i][indexOfColumnOfFirstTable];
!           object object2 = orderedRowsTable2[i][indexOfColumnOfSecondTable];
!           if( object1 == object2 )
            {
!             hashTable.Add(object1, object2);
              j = currentIndex;
            }
          }
        }
        return hashTable;
--- 140,167 ----
        string columnNameTable1 = firstDataTable.Columns[indexOfColumnOfFirstTable].ColumnName;
        string columnNameTable2 = firstDataTable.Columns[indexOfColumnOfSecondTable].ColumnName;
!       DataRow[] orderedRowsTable1 = firstDataTable.Select(columnNameTable1 + "<>' '", columnNameTable1 + " DESC");
!       DataRow[] orderedRowsTable2 = secondDataTable.Select(columnNameTable2 + "<>' '", columnNameTable2 + " DESC");
        int j = 0;
+       bool found;
        for(int i=0; i != orderedRowsTable1.Length; i++)
        {
!         found = false;
!         for(; j != orderedRowsTable2.Length && !found; j++)
          {
            int currentIndex = j;
            object object1 = orderedRowsTable1[i][indexOfColumnOfFirstTable];
!           object object2 = orderedRowsTable2[j][indexOfColumnOfSecondTable];
!           if( (string)object1 == (string)object2 )
            {
!             found = true;
              j = currentIndex;
+             hashTable.Add(object1, object2);
            }
          }
+         if( !found )
+         {
+           j = 0;
+         }
+ 
        }
        return hashTable;

[Quantproject-developers] QuantDownloader/Downloader/Validate ValidateDataGrid.cs,1.6,1.7

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

Update of /cvsroot/quantproject/QuantDownloader/Downloader/Validate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20713/Downloader/Validate

Modified Files:
	ValidateDataGrid.cs 
Log Message:
Fixed some minor bugs 

Index: ValidateDataGrid.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/Validate/ValidateDataGrid.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ValidateDataGrid.cs	8 May 2004 17:30:54 -0000	1.6
--- ValidateDataGrid.cs	27 Aug 2004 23:20:48 -0000	1.7
***************
*** 26,36 ****
      public ValidateDataTable Validate(DataTable dataTable, string suspiciousRatio )
      {
!       this.validateDataTable = new ValidateDataTable(dataTable);
!       this.DataSource = validateDataTable;
  //      if ( this.TableStyles.Count == 0 )
  //        // styles have not been defined yet
  //        validate_setTableStyle();
!       validateDataTable.AddRows( "pippo" );
!       return this.validateDataTable;
      }
  	
--- 26,37 ----
      public ValidateDataTable Validate(DataTable dataTable, string suspiciousRatio )
      {
!       return this.Validate((string)dataTable.Rows[0][0], suspiciousRatio);
!       //this.validateDataTable = new ValidateDataTable(dataTable);
!       //this.DataSource = validateDataTable;
  //      if ( this.TableStyles.Count == 0 )
  //        // styles have not been defined yet
  //        validate_setTableStyle();
!       //validateDataTable.AddRows( "pippo" );
!       //return this.validateDataTable;
      }