[Quantproject-developers] QuantDownloader/Downloader TickerDownloader.cs, 1.25, 1.26
Brought to you by:
glauco_1
|
From: Marco M. <mi...@us...> - 2012-12-30 23:41:19
|
Update of /cvsroot/quantproject/QuantDownloader/Downloader In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21878 Modified Files: TickerDownloader.cs Log Message: The calls to the methods for parsing strings to numbers have been written in a more logical and flexible way (there is no change at all). Index: TickerDownloader.cs =================================================================== RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/TickerDownloader.cs,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TickerDownloader.cs 29 Sep 2011 21:46:52 -0000 1.25 --- TickerDownloader.cs 30 Dec 2012 23:41:16 -0000 1.26 *************** *** 3,6 **** --- 3,7 ---- using System.Data; using System.Data.Common; + using System.Globalization; using System.IO; using System.Net; *************** *** 255,265 **** myRow[ "quTicker" ] = this.currentTicker; ! myRow[ "quDate" ]=DateTime.Parse( LineIn[0] ); ! myRow[ "quOpen" ]=Double.Parse( LineIn[1] ); ! myRow[ "quHigh" ]=Double.Parse( LineIn[2] ); ! myRow[ "quLow" ]=Double.Parse( LineIn[3] ); ! myRow[ "quClose" ]=Double.Parse( LineIn[4] ); ! myRow[ "quVolume" ]=Math.Min(Double.Parse( LineIn[5]),Convert.ToDouble(Int32.MaxValue)); ! myRow[ "quAdjustedClose" ]=Double.Parse( LineIn[6] ); this.downloadedValuesFromSource.Rows.Add(myRow); --- 256,266 ---- myRow[ "quTicker" ] = this.currentTicker; ! myRow[ "quDate" ]= DateTime.Parse( LineIn[0] ); ! myRow[ "quOpen" ]= doubleParseFromEnglishString( LineIn[1] ); ! myRow[ "quHigh" ]= doubleParseFromEnglishString( LineIn[2] ); ! myRow[ "quLow" ]= doubleParseFromEnglishString( LineIn[3] ); ! myRow[ "quClose" ]= doubleParseFromEnglishString( LineIn[4] ); ! myRow[ "quVolume" ]= Math.Min(doubleParseFromEnglishString( LineIn[5]),Convert.ToDouble(Int32.MaxValue)); ! myRow[ "quAdjustedClose" ]= doubleParseFromEnglishString( LineIn[6] ); this.downloadedValuesFromSource.Rows.Add(myRow); *************** *** 520,524 **** LineIn=Line.Split(','); } ! return Single.Parse(LineIn[6]); } --- 521,525 ---- LineIn=Line.Split(','); } ! return singleParseFromEnglishString(LineIn[6]); } *************** *** 791,794 **** --- 792,809 ---- } } + private double doubleParseFromEnglishString(string stringToParse) + { + double returnValue; + CultureInfo culture = new CultureInfo("en-US"); + returnValue = Double.Parse(stringToParse, culture.NumberFormat); + return returnValue; + } + private float singleParseFromEnglishString(string stringToParse) + { + float returnValue; + CultureInfo culture = new CultureInfo("en-US"); + returnValue = Single.Parse(stringToParse, culture.NumberFormat); + return returnValue; + } } } |