コミット: 4a19d2e38eceb83051bcd3431dce63ce3c28d7cd - OmegaChart (git)

OmegaChartのソースコードの保守

コミットメタ情報

• リビジョン: 4a19d2e38eceb83051bcd3431dce63ce3c28d7cd (tree)
• 日時: 2014-04-29 16:45:05
• 作者: panacoran <panacoran@user...>
• コミッター: panacoran

ログメッセージ

日付の制約を取り除く

https://sourceforge.jp/users/panacoran/pastebin/910
の指摘に基づいてDatePickerの最大最小の設定を外した。
週足のロジックを変更して日付の制約がないものにした。

変更サマリ

• modified: AutoTradingDialog.cs
• modified: Data.cs
• modified: Env.cs
• modified: ScreeningDialog.cs
• delete: Weekly.cs
• modified: zanetti.csproj

差分

--- a/AutoTradingDialog.cs
+++ b/AutoTradingDialog.cs
@@ -264,7 +264,6 @@ namespace Zanetti.Forms {
             // 
             this._startDatePicker.Checked = false;
             this._startDatePicker.Location = new System.Drawing.Point(80, 16);
-            this._startDatePicker.MinDate = new System.DateTime(1996, 1, 1, 0, 0, 0, 0);
             this._startDatePicker.Name = "_startDatePicker";
             this._startDatePicker.Size = new System.Drawing.Size(200, 19);
             this._startDatePicker.TabIndex = 1;
@@ -282,8 +281,6 @@ namespace Zanetti.Forms {
             // _endDatePicker
             // 
             this._endDatePicker.Location = new System.Drawing.Point(80, 40);
-            this._endDatePicker.MaxDate = new System.DateTime(2010, 12, 31, 0, 0, 0, 0);
-            this._endDatePicker.MinDate = new System.DateTime(1996, 1, 1, 0, 0, 0, 0);
             this._endDatePicker.Name = "_endDatePicker";
             this._endDatePicker.Size = new System.Drawing.Size(200, 19);
             this._endDatePicker.TabIndex = 3;

--- a/Data.cs
+++ b/Data.cs
@@ -3,6 +3,10 @@
  * 
  * $Id$
  */
+// Copyright (c) 2014 panacoran <[e-mail]>
+// This program is part of OmegaChart.
+// OmegaChart is licensed under the Apache License, Version 2.0.
+
 using System;
 using System.IO;
 using System.Collections;
@@ -353,26 +357,28 @@ namespace Zanetti.Data
 					_isEmpty = false;
 					_firstDate= GetInt(daily, 0);
 					_lastDate = GetInt(daily, daily.Length-RECORD_LENGTH);
-					WeeklyIndex weekly_begin = Env.WeekFormat.FindByDate(GetInt(daily, 0));
-					WeeklyIndex weekly_end   = Env.WeekFormat.FindByDate(GetInt(daily, daily.Length-RECORD_LENGTH));
-					_filledLength = weekly_end.Index+1 - weekly_begin.Index;
+				    var daily_begin = Util.IntToDate(GetInt(daily, 0));
+				    var weekly_begin = daily_begin.AddDays(-(int)daily_begin.DayOfWeek);
+				    var daily_end = Util.IntToDate(GetInt(daily, daily.Length - RECORD_LENGTH));
+				    var weekly_end = daily_end.AddDays(-(int)daily_end.DayOfWeek);
+				    _filledLength = (int)(weekly_end - weekly_begin).TotalDays / 7  + 1;
 					_data = new TradeData[_filledLength + Env.CurrentIndicators.GetAddedFutureLength(ChartFormat.Weekly)];
 
 					//byte[]部分のデータ読み
 					_farm = new byte[_data.Length * RECORD_LENGTH];
 					_byteLength = _farm.Length;
 					int offset = 0;
-					for(int i=weekly_begin.Index; i<=weekly_end.Index; i++) {
-						WeeklyIndex wi = Env.WeekFormat.GetAt(i);
-						offset = FillWeeklyData((i-weekly_begin.Index)*RECORD_LENGTH, daily, offset, wi);
+				    var weekly = weekly_begin;
+					for(int i=0; i < _filledLength; i++, weekly = weekly.AddDays(7)) {
+						offset = FillWeeklyData(i*RECORD_LENGTH, daily, offset, Util.DateToInt(weekly));
 						if(offset>=daily.Length) break;
 					}
 				}
 			}
 		}
-		private int FillWeeklyData(int farmoffset, byte[] daily, int offset, WeeklyIndex wi) {
+		private int FillWeeklyData(int farmoffset, byte[] daily, int offset, int firstdate) {
 
-			int enddate = Env.WeekFormat.Length>wi.Index+1? Env.WeekFormat.GetAt(wi.Index+1).FirstDate : Util.DateToInt(Util.IntToDate(wi.FirstDate).AddDays(7));
+			int enddate = Util.DateToInt(Util.IntToDate(firstdate).AddDays(7));
 
 			int vol = 0, high = Int32.MinValue, low = Int32.MaxValue;
 			int open = 0, close = 0, cre_long = 0, cre_short = 0;
@@ -384,7 +390,7 @@ namespace Zanetti.Data
 			// で、後に式を評価する際に用いられる基準日として日曜基準で 'wi.FirstDate' を使っているのだから、
 			// ここでもこの値を使うべき。　2005/3/15 T. SARUKI
 			//
-			double base_split = this.CalcSplitRatio(wi.FirstDate); //分割を考慮する場合は期間内の調整が要る
+			double base_split = this.CalcSplitRatio(firstdate); //分割を考慮する場合は期間内の調整が要る
 			while(offset<=daily.Length-RECORD_LENGTH && today<enddate) {
 				//if(!is_index && today>20031201) Debugger.Break();
                 double split = Env.Preference.AdjustSplit? this.CalcSplitRatio(today) / base_split : 1;
@@ -403,7 +409,7 @@ namespace Zanetti.Data
 				if(offset<daily.Length) today = GetInt(daily, offset);
 			}
 
-			SetInt(_farm, farmoffset, wi.FirstDate);
+			SetInt(_farm, farmoffset, firstdate);
 			SetInt(_farm, farmoffset+OPEN_OFFSET,  open);
 			SetInt(_farm, farmoffset+HIGH_OFFSET,  high);
 			SetInt(_farm, farmoffset+LOW_OFFSET,   low);

--- a/Env.cs
+++ b/Env.cs
@@ -43,7 +43,6 @@ namespace Zanetti
 		private static CommandCollection _command;
 		private static BrandHistory _history;
 		private static StorageNode _rootStorageNode;
-		private static WeekFormat _weekFormat;
 		private static ImageList _imageList16;
 
 		public static Preference Preference {
@@ -118,12 +117,6 @@ namespace Zanetti
 				return _freeLines;
 			}
 		}
-		public static WeekFormat WeekFormat {
-			get {
-				return _weekFormat;
-			}
-		}
-
 		//パース済み設定ファイルのルート　ネーミングはちとおかしいが
 		public static StorageNode RootStorageNode {
 			get {
@@ -167,7 +160,6 @@ namespace Zanetti
 			_options = new Options();
 			_bookmark = new Bookmark();
 			_freeLines = new FreeLineCollection();
-			_weekFormat = new WeekFormat();
 			_history = new BrandHistory();
 			InitialAction act = new InitialAction();
 			

--- a/ScreeningDialog.cs
+++ b/ScreeningDialog.cs
@@ -276,7 +276,6 @@ namespace Zanetti.Forms
             // 
             this._datePicker.Checked = false;
             this._datePicker.Location = new System.Drawing.Point(16, 16);
-            this._datePicker.MinDate = new System.DateTime(1996, 1, 1, 0, 0, 0, 0);
             this._datePicker.Name = "_datePicker";
             this._datePicker.Size = new System.Drawing.Size(200, 19);
             this._datePicker.TabIndex = 12;

--- a/Weekly.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Daisuke OKAJIMA    All rights reserved.
- * 
- * $Id$
- */
-using System;
-using System.Diagnostics;
-using System.Collections;
-
-namespace Zanetti.Data
-{
-	//毎週月曜からの見出し項目
-	internal class WeeklyIndex
-	{
-		private int _index;
-		private int _firstDate;
-		private bool _startOfQuarter;
-
-		public int FirstDate {
-			get {
-				return _firstDate;
-			}
-		}
-		public int Index {
-			get {
-				return _index;
-			}
-		}
-		public bool StartOfQuarter {
-			get {
-				return _startOfQuarter;
-			}
-		}
-
-		public WeeklyIndex(int index, int firstdate, bool quarter) {
-			_index = index;
-			_firstDate = firstdate;
-			_startOfQuarter = quarter;
-		}
-	}
-
-	//毎週月曜のコレクション
-	internal class WeekFormat {
-		private WeeklyIndex[] _data;
-
-		private void Construct() {
-			DateTime dt = new DateTime(1987,12,27); //こいつは日曜日
-			ArrayList t = new ArrayList(500);
-			DateTime now = DateTime.Now;
-			int i = 0;
-			while(dt < now) {
-				int dti = Util.DateToInt(dt);
-				int m = (dti % 10000) / 100;
-				int d = dti % 100;
-				t.Add(new WeeklyIndex(i++, dti, d<=7 && (m==1 || m==4 || m==7 || m==10)));
-				dt = dt.AddDays(7);
-			}
-
-			_data = (WeeklyIndex[])t.ToArray(typeof(WeeklyIndex));
-		}
-
-		public WeeklyIndex FindByDate(int date) {
-			if(_data==null) Construct();
-			if(date<_data[1].FirstDate)
-				return _data[0]; //両端はよくあるケースなので
-			else if(date>=_data[_data.Length-1].FirstDate)
-				return _data[_data.Length-1];
-			else
-				return FindByDate(date, 0, _data.Length); 
-		}
-		private WeeklyIndex FindByDate(int date, int start, int end) {
-			int m = (start+end)/2;
-			if(_data[m].FirstDate > date)
-				return FindByDate(date, start, m);
-			else if(_data[m+1].FirstDate <= date)
-				return FindByDate(date, m+1, end);
-			else
-				return _data[m];
-		}
-
-		public WeeklyIndex GetAt(int index) {
-			if(_data==null) Construct();
-			Debug.Assert(index>=0 && index<_data.Length);
-			return _data[index];
-		}
-		public int Length {
-			get {
-				if(_data==null) Construct();
-				return _data.Length;
-			}
-		}
-	}
-
-
-}

--- a/zanetti.csproj
+++ b/zanetti.csproj
@@ -364,7 +364,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Visitor.cs" />
-    <Compile Include="Weekly.cs" />
     <Compile Include="Win32.cs" />
     <Compile Include="XmlStorageRW.cs" />
     <Compile Include="XmlUtil.cs" />