[Quantproject-developers] QuantProject/b3_Data/Selectors TickerSelector.cs,1.2,1.3

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

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

Modified Files:
	TickerSelector.cs 
Log Message:
Implemented part of the method that retrieves tickers according to a specified rule and a given set of tickers to be filtered 

Index: TickerSelector.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/Selectors/TickerSelector.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TickerSelector.cs	8 May 2004 17:19:41 -0000	1.2
--- TickerSelector.cs	19 Jun 2004 01:13:00 -0000	1.3
***************
*** 38,43 ****
    public class TickerSelector : ITickerSelector
    {
      private SelectionRule selectionRule;
! 
      public TickerSelector(SelectionRule selectionRule)
      {
--- 38,50 ----
    public class TickerSelector : ITickerSelector
    {
+     private DataTable setOfTickersToBeSelected = null;
      private SelectionRule selectionRule;
!     
!     public TickerSelector(DataTable setOfTickersToBeSelected, SelectionRule selectionRule)
!     {
!       this.setOfTickersToBeSelected = setOfTickersToBeSelected;
!       this.selectionRule = selectionRule;
!     }
!     
      public TickerSelector(SelectionRule selectionRule)
      {
***************
*** 47,55 ****
      public DataTable GetSelectedTickers()
      {
!        //TODO: implement switching code to the proper method of selection
!        return QuantProject.DataAccess.Tables.Quotes.GetMostLiquidTickers(this.selectionRule.GroupID,
                                              this.selectionRule.FirstQuoteDate,
                                              this.selectionRule.LastQuoteDate,
                                              this.selectionRule.MaxNumOfReturnedTickers);
      }
      
--- 54,76 ----
      public DataTable GetSelectedTickers()
      {
!        if(this.setOfTickersToBeSelected == null &&
!           this.selectionRule.TypeOfSelection == SelectionType.MostLiquid)
!        {
!          return QuantProject.DataAccess.Tables.Quotes.GetMostLiquidTickers(this.selectionRule.GroupID,
                                              this.selectionRule.FirstQuoteDate,
                                              this.selectionRule.LastQuoteDate,
                                              this.selectionRule.MaxNumOfReturnedTickers);
+        }
+        else if(this.setOfTickersToBeSelected != null &&
+                this.selectionRule.TypeOfSelection == SelectionType.MostLiquid)
+        {
+          return QuantProject.DataAccess.Tables.Quotes.GetMostLiquidTickers(this.setOfTickersToBeSelected, 
+                                             this.selectionRule.FirstQuoteDate,
+                                             this.selectionRule.LastQuoteDate,
+                                             this.selectionRule.MaxNumOfReturnedTickers);    
+        }
+        else
+        return new DataTable();
+        //this line should never be reached!!
      }