Commit: 91231cd3fa57ce1280f1cbc59aef208c3b46e712 - OmegaChart (git)

OmegaChartのソースコードの保守

Commit MetaInfo

• Revision: 91231cd3fa57ce1280f1cbc59aef208c3b46e712 (tree)
• Time: 2022-04-04 22:58:00
• Author: panacoran <panacoran@user...>
• Commiter: panacoran

Log Message

複数市場対応で市場チェックしていたのを出来高ベースに変える

Change Summary

• modified: Edatalab.cs
• modified: Mujinzou.cs

Incremental Difference

--- a/Edatalab.cs
+++ b/Edatalab.cs
@@ -2,6 +2,7 @@
 // This program is part of OmegaChart.
 // OmegaChart is licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -68,63 +69,35 @@ namespace Zanetti.DataSource.Specialized
                     if (code > 1002 && code < 1300) // 各種指数を無視する。
                         continue;
                     code = code == 1001 ? (int)BuiltInIndex.Nikkei225 : code == 1002 ? (int)BuiltInIndex.TOPIX : code;
-                    var br = Env.BrandCollection.FindBrand(code) as BasicBrand;
-                    if (br == null ||
-                        (d2.Year < 2006 ? !CheckMarketOld(br.Market, tokens[8]) : !CheckMarket(br.Market, tokens[2])))
+                    if (!(Env.BrandCollection.FindBrand(code) is BasicBrand))
                         continue;
-                    var vv = IsIndex(code) ? 0.001 : 1;
-                    var pv = IsIndex(code) ? 100 : 10; // 指数は100倍、株価は10倍で記録。
-                    result[code] = new NewDailyData
+                    try
                     {
-                        open = (int)(double.Parse(tokens[3]) * pv),
-                        high = (int)(double.Parse(tokens[4]) * pv),
-                        low = (int)(double.Parse(tokens[5]) * pv),
-                        close = (int)(double.Parse(tokens[6]) * pv),
-                        volume = (int)(double.Parse(tokens[7]) * vv),
-                    };
+                        var vv = IsIndex(code) ? 0.001 : 1;
+                        var pv = IsIndex(code) ? 100 : 10; // 指数は100倍、株価は10倍で記録。
+                        var td = new NewDailyData
+                        {
+                            volume = (int)(double.Parse(tokens[7]) * vv)
+                        };
+					    // 複数市場に上場している銘柄には複数のエントリがある。出来高の多いほうをとる。
+                        if (!result.TryGetValue(code, out var existing) || existing.volume < td.volume)
+                        {
+						    result[code] = td;
+                            td.open = (int)(double.Parse(tokens[3]) * pv);
+                            td.high = (int)(double.Parse(tokens[4]) * pv);
+                            td.low = (int)(double.Parse(tokens[5]) * pv);
+                            td.close = (int)(double.Parse(tokens[6]) * pv);
+                            td.volume = (int)(double.Parse(tokens[7]) * vv);
+					    }
+                    }
+                    catch (FormatException)
+                    {
+                    }
                 }
             }
             return result;
         }
 
-        private bool CheckMarketOld(MarketType market, string name)
-        {
-            switch (int.Parse(name))
-            {
-                case 1:
-                    return market == MarketType.T1 ||
-                           market == MarketType.B; // 指数は東証1部
-                case 2:
-                    return market == MarketType.T2;
-                case 3:
-                    return market == MarketType.J;
-            }
-            return false;
-        }
-
-        private bool CheckMarket(MarketType market, string name)
-        {
-            switch (int.Parse(name))
-            {
-                case 1:
-                    return market == MarketType.T1 ||
-                           market == MarketType.B; // 指数は東証1部
-                case 2:
-                    return market == MarketType.T2;
-                case 3:
-                    return market == MarketType.M;
-                case 4:
-                    return market == MarketType.J;
-                case 6:
-                    return market == MarketType.O1;
-                case 7:
-                    return market == MarketType.O2;
-                case 8:
-                    return market == MarketType.H;
-            }
-            return false;
-        }
-
         private bool IsIndex(int code)
         {
             return code == (int)BuiltInIndex.Nikkei225 ||

--- a/Mujinzou.cs
+++ b/Mujinzou.cs
@@ -14,6 +14,7 @@ using System.IO;
 using System.Collections;
 using System.Diagnostics;
 using Zanetti.Data;
+using System.Collections.Generic;
 
 namespace Zanetti.DataSource.Specialized {
 	internal class MujinzouDataSource : DailyDataSource {
@@ -33,44 +34,46 @@ namespace Zanetti.DataSource.Specialized {
 		}
 
 		public override void Run() {
-			Hashtable[] newdata = new Hashtable[_dates.Length];
-			//データをまずダウンロード
-			for(int i=0; i<_dates.Length; i++) {
-				newdata[i] = FillData(_dates[i]);
-				SendMessage(AsyncConst.WM_ASYNCPROCESS, _dates[i] | DATE_MASK, AsyncConst.LPARAM_PROGRESS_SUCCESSFUL);
-			}
-
-			//各データの追加と保存
-			IDictionaryEnumerator ie = Env.BrandCollection.GetEnumerator();
-			while(ie.MoveNext()) {
-				AbstractBrand br = (AbstractBrand)ie.Value;
-				if((br.Market==MarketType.B && !IsMujinzouSupportedIndices(br.Code)) || br.Market==MarketType.Custom) continue;
-			
-				bool trace_flag = false;
-				using(DailyDataFarm f = (DailyDataFarm)br.CreateDailyFarm(_dates.Length)) {
-					for(int i=0; i<_dates.Length; i++) {
-						NewDailyData td = (NewDailyData)newdata[i][br.Code];
-						if(td==null) {
-							if(!trace_flag) {
-								trace_flag = true;
-								Debug.WriteLine("Data not found(mujinzou) : code="+br.Code+" market="+br.Market.ToString());
-							}
-						}
-						else
-							f.UpdateDataFarm(_dates[i], td);
-					}
-					f.Save(Util.GetDailyDataFileName(br.Code));
-				}
-				SendMessage(AsyncConst.WM_ASYNCPROCESS, br.Code, AsyncConst.LPARAM_PROGRESS_SUCCESSFUL);
-			}
+            var newdata = new Dictionary<int, Dictionary<int, NewDailyData>>();
+			            foreach (var date in _dates)
+            {
+                newdata[date] = FillData(date);
+                SendMessage(AsyncConst.WM_ASYNCPROCESS, (date | DATE_MASK), AsyncConst.LPARAM_PROGRESS_SUCCESSFUL);
+            }
+            foreach (AbstractBrand br in Env.BrandCollection.Values)
+            {
+                if (br.Market == MarketType.B && !IsDomesticIndex(br.Code) || br.Market == MarketType.Custom)
+                    continue;
+                using (var farm = (DailyDataFarm)br.CreateDailyFarm(_dates.Length))
+                {
+                    var traceFlag = false;
+                    foreach (var date in _dates)
+                    {
+                        NewDailyData td;
+                        if (newdata[date].TryGetValue(br.Code, out td))
+                        {
+                            farm.UpdateDataFarm(date, td);
+                        }
+                        else
+                        {
+                            if (traceFlag)
+                                continue;
+                            traceFlag = true;
+                            Debug.WriteLine("Data not found(mujinzou) : code=" + br.Code + " market=" + br.Market);
+                        }
+                    }
+                    farm.Save(Util.GetDailyDataFileName(br.Code));
+                    SendMessage(AsyncConst.WM_ASYNCPROCESS, br.Code, AsyncConst.LPARAM_PROGRESS_SUCCESSFUL);
+                }
+            }
 		}
 
 
 		//ある日付に対して、コードのint値からPanRollingTradeDataへのハッシュテーブルを構築して返す
-		private Hashtable FillData(int date) {
+		private Dictionary<int, NewDailyData> FillData(int date) {
 			TextReader r = null;
 			try {
-				Hashtable result = new Hashtable();
+				var result = new Dictionary<int, NewDailyData>();
 				DateTime d2 = Util.IntToDate(date);
 				//無尽蔵にはデータが２種類あり、日経先物等の有無、名証銘柄の有無、出来高０のときの扱い、が異なるようだ。先物のデータがとれるようにこちらを使用する
                 //2007/3/1, eonetからのデータが入手不能になる。標準をinfoseekに切り替えるとともに、ついでに設定ファイルで切り替え可能にした。相場が大荒れの時期に面倒くさいことが起きたものだ。
@@ -81,45 +84,42 @@ namespace Zanetti.DataSource.Specialized {
                     : "d_data/" + d2.ToString(@"yyyy\d/yy_MM\d/TyyMMdd");
 				var ext = d2.Year >= 2015 ? ".zip" : ".lzh";
                 var url = $"http://{domain}/{path}{ext}";
-				r = new StreamReader(Util.ExtractData(url), Encoding.Default);
-
-				string line = r.ReadLine();
-				while(line!=null) {
-					string[] t = line.Split(',');
-					//例      0    1  2             3     4     5     6     7,         8,       9
-					//2005/5/20,1001,11,1001 日経平均,11104,11110,11034,11037,1257840000,東証１部
-					if(t.Length==10 && t[1].Length==4) {
+				using (var reader = new StreamReader(Util.ExtractData(url), Encoding.Default))
+				{
+					string line;
+					while ((line = reader.ReadLine()) != null)
+					{
+						string[] t = line.Split(',');
+						//例      0    1  2             3     4     5     6     7,         8,       9
+						//2005/5/20,1001,11,1001 日経平均,11104,11110,11034,11037,1257840000,東証１部
+						if (t.Length != 10 || t[1].Length != 4)
+							continue;
 						int code = ParseCode(t[1]);
-
-						BasicBrand br = Env.BrandCollection.FindBrand(code) as BasicBrand;
-						if(br!=null && CheckMarket(br, Util.ParseInt(t[2], 0))) {
-
-							double vv = 1, pv = 10; // 株価は10倍で記録
-							//倍率調整
-							if(IsDomesticIndex(code)) {
-								vv = 0.001; //DreamVisorのものにあわせる格好で。1000株単位かな
-								pv = 100;
+                        if (!(Env.BrandCollection.FindBrand(code) is BasicBrand))
+                            continue;
+                        try
+						{
+							var vv = IsDomesticIndex(code) ? 0.001 : 1;
+							var pv = IsDomesticIndex(code) ? 100 : 10; // 指数は100倍、株価は10倍で記録。
+							var td = new NewDailyData
+							{
+								volume = (int)(double.Parse(t[8]) * vv)
+							};
+							// 複数市場に上場している銘柄には複数のエントリがある。出来高の多いほうをとる。
+							if (!result.TryGetValue(code, out var existing) || existing.volume < td.volume)
+							{
+								result[code] = td;
+								td.open = (int)(double.Parse(t[4]) * pv);
+								td.high = (int)(double.Parse(t[5]) * pv);
+								td.low = (int)(double.Parse(t[6]) * pv);
+								td.close = (int)(double.Parse(t[7]) * pv);
+								td.volume = (int)(double.Parse(t[8]) * vv);						
 							}
-							if(code==(int)BuiltInIndex.TOPIX_F) { //TOPIX先物は整数単位で記録されている
-								pv = 10;
-							}
-
-							NewDailyData td = new NewDailyData();
-						    try {
-						        td.volume = (int)(Double.Parse(t[8]) * vv);
-						        NewDailyData existing = (NewDailyData)result[code];
-						        //Debug.WriteLine(line);
-						        td.open = (int)(Double.Parse(t[4]) * pv);
-						        td.high = (int)(Double.Parse(t[5]) * pv);
-						        td.low = (int)(Double.Parse(t[6]) * pv);
-						        td.close = (int)(Double.Parse(t[7]) * pv);
-						    }
-						    catch (FormatException) {
-						    }
-						    result[code] = td;
+						}
+						catch (FormatException)
+						{
 						}
 					}
-					line = r.ReadLine();
 				}
 				return result;
 			}
@@ -128,30 +128,6 @@ namespace Zanetti.DataSource.Specialized {
 			}
 		}
 
-		private static bool CheckMarket(BasicBrand br, int muj) {
-			MarketType mt = br.Market;
-			switch(mt) {
-                //2006/12/26のデータより、東証はすべてコード11, 大証１・２部は21, ヘラクレスは23に変更になった。旧データを読んだときでも大丈夫なように古い判定も残しておく
-				case MarketType.B:
-					return muj==11; //指数は東証一部として記録されている
-				case MarketType.T1:
-					return muj==11;
-				case MarketType.T2:
-					return muj==11 || muj==12;
-				case MarketType.O1:
-					return muj==21;
-				case MarketType.O2:
-					return muj==21 || muj==22;
-				case MarketType.M:
-                    return muj==21 || muj==13;
-				case MarketType.J:
-					return muj==91;
-				case MarketType.H:
-					return muj==23 || muj==24;
-				default:
-					return false;
-			}
-		}
 		private static bool IsMujinzouSupportedIndices(int code) {
 			return code==(int)BuiltInIndex.Nikkei225 ||
 				code==(int)BuiltInIndex.TOPIX ||