• R/O
  • SSH
  • HTTPS

protra: 提交


Commit MetaInfo

修訂554 (tree)
時間2022-04-16 21:06:29
作者panacoran

Log Message

東証の市場区分見直しに対応する

* Protra.Lib/Data/BrandData.cs (Market): 新市場区分を追加
* Protra.Lib/Data/PriceData.cs (Price.Market): 削除
* Protra.Lib/Update/KabukaJohoUpdator.cs (KabukaJohoUpdator.ParseLine): Marketの設定を削除
* Protra.Lib/Update/MujinzouUpdator.cs (MujinzouUpdator.ParseLine): Marketの設定を削除
* PtSim/SystemExecutor.cs (SystemExecutor.LoopDateOnly): Marketの設定を削除

Change Summary

差異

--- protra/trunk/ChangeLog.txt (revision 553)
+++ protra/trunk/ChangeLog.txt (revision 554)
@@ -1,3 +1,13 @@
1+2022-04-16 panacoran <panacoran@users.osdn.me>
2+
3+ 東証の市場区分見直しに対応する
4+
5+ * Protra.Lib/Data/BrandData.cs (Market): 新市場区分を追加
6+ * Protra.Lib/Data/PriceData.cs (Price.Market): 削除
7+ * Protra.Lib/Update/KabukaJohoUpdator.cs (KabukaJohoUpdator.ParseLine): Marketの設定を削除
8+ * Protra.Lib/Update/MujinzouUpdator.cs (MujinzouUpdator.ParseLine): Marketの設定を削除
9+ * PtSim/SystemExecutor.cs (SystemExecutor.LoopDateOnly): Marketの設定を削除
10+
111 2021-05-02 panacoran <panacoran@users.osdn.me>
212
313 バージョン2.5のリリース準備
--- protra/trunk/Protra.Lib/Data/BrandData.cs (revision 553)
+++ protra/trunk/Protra.Lib/Data/BrandData.cs (revision 554)
@@ -73,6 +73,14 @@
7373 return "大証2部";
7474 case "H":
7575 return "ヘラクレス";
76+ case "T":
77+ return "東証 ";
78+ case "TP":
79+ return "東証P";
80+ case "TS":
81+ return "東証S";
82+ case "TG":
83+ return "東証G";
7684 default:
7785 return "不明";
7886 }
@@ -83,7 +91,7 @@
8391 /// </summary>
8492 public static string[] Codes
8593 {
86- get { return new[] {"T1", "T2", "M", "J"}; }
94+ get { return new[] {"T", "TP", "TS", "TG"}; }
8795 }
8896
8997 /// <summary>
@@ -91,7 +99,7 @@
9199 /// </summary>
92100 public static string[] AllCodes
93101 {
94- get { return new[] {"T1", "T2", "M", "J", "O1", "O2", "H"}; }
102+ get { return new[] {"T", "TP", "TS", "TG", "T1", "T2", "M", "J", "O1", "O2", "H"}; }
95103 }
96104
97105 /// <summary>
--- protra/trunk/Protra.Lib/Data/PriceData.cs (revision 553)
+++ protra/trunk/Protra.Lib/Data/PriceData.cs (revision 554)
@@ -43,11 +43,6 @@
4343 public string Code { get; set; }
4444
4545 /// <summary>
46- /// 市場
47- /// </summary>
48- public string Market { get; set; }
49-
50- /// <summary>
5146 /// 日付
5247 /// </summary>
5348 public DateTime Date { get; set; }
--- protra/trunk/Protra.Lib/Update/KabukaJohoUpdator.cs (revision 553)
+++ protra/trunk/Protra.Lib/Update/KabukaJohoUpdator.cs (revision 554)
@@ -74,35 +74,6 @@
7474 if (String.Compare(r.Code, "1002", StringComparison.Ordinal) > 0 &&
7575 String.Compare(r.Code, "1300", StringComparison.Ordinal) < 0)
7676 return null; // 各種指数を無視する。
77- if (r.Date.Year >= 2006)
78- {
79- switch (int.Parse(tokens[2]))
80- {
81- case 1:
82- r.Market = "T1";
83- break;
84- case 2:
85- r.Market = "T2";
86- break;
87- case 3:
88- r.Market = "M";
89- break;
90- case 4:
91- r.Market = "J";
92- break;
93- case 6:
94- r.Market = "O1";
95- break;
96- case 7:
97- r.Market = "O2";
98- break;
99- case 8:
100- r.Market = "H";
101- break;
102- default:
103- return null;
104- }
105- }
10677 // 指数の値に小数が含まれているのでdouble.Parseを利用する。
10778 r.Open = (int)double.Parse(tokens[3]);
10879 r.High = (int)double.Parse(tokens[4]);
@@ -109,23 +80,6 @@
10980 r.Low = (int)double.Parse(tokens[5]);
11081 r.Close = (int)double.Parse(tokens[6]);
11182 r.Volume = double.Parse(tokens[7]) / 1000;
112- if (r.Date.Year < 2006)
113- {
114- switch (int.Parse(tokens[8]))
115- {
116- case 1:
117- r.Market = "T1";
118- break;
119- case 2:
120- r.Market = "T2";
121- break;
122- case 3:
123- r.Market = "J";
124- break;
125- default:
126- return null;
127- }
128- }
12983 }
13084 catch (FormatException)
13185 {
--- protra/trunk/Protra.Lib/Update/MujinzouUpdator.cs (revision 553)
+++ protra/trunk/Protra.Lib/Update/MujinzouUpdator.cs (revision 554)
@@ -83,43 +83,6 @@
8383 r.Low = (int)double.Parse(tokens[6]);
8484 r.Close = (int)double.Parse(tokens[7]);
8585 r.Volume = double.Parse(tokens[8]) / 1000;
86- switch (tokens[2])
87- {
88- case "11":
89- r.Market = "T1";
90- break;
91- case "12":
92- r.Market = "T2";
93- break;
94- case "13":
95- r.Market = "M";
96- break;
97- case "14":
98- r.Market = "T1";
99- break;
100- case "20": //この大証は1部、2部混在しているので1部にする
101- case "21":
102- r.Market = "O1";
103- break;
104- case "22":
105- r.Market = "O2";
106- break;
107- case "23":
108- case "24":
109- r.Market = "H";
110- break;
111- case "32":
112- if (tokens[9] == "東証2部") // データのミスに対応する。
113- r.Market = "T2";
114- else
115- return null;
116- break;
117- case "91":
118- r.Market = "J";
119- break;
120- default:
121- return null;
122- }
12386 }
12487 catch (FormatException)
12588 {
--- protra/trunk/PtSim/SystemExecutor.cs (revision 553)
+++ protra/trunk/PtSim/SystemExecutor.cs (revision 554)
@@ -145,7 +145,6 @@
145145 foreach (var p in prices)
146146 {
147147 p.Code = "0000";
148- p.Market = "不明";
149148 p.Open = p.High = p.Low = p.Close = 0;
150149 p.Volume = 0;
151150 }
Show on old repository browser