diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 0000000..88aee0c --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,45 @@ +# quantitative-data-analysis-rs Copilot インストラクション(初版) + +## 目的と前提 + +- 本プロジェクトはRustによる株価・財務指標分析ツール(README参照)。ヘキサゴナルアーキテクチャを崩さず、`domain`/`use_case` + でロジック、`infrastructure`/`presenter`で外部適合を行う。 + +## 開発ガイドライン + +このプロジェクトはMicrosoftのPragmatic Rust Guidelinesに従います。 + +### Quick Reference + +- Complete guidelines: `~/rust-guidelines.txt` +- Focus areas: Error handling, API design, performance, interoperability +- Tools: rustfmt, clippy, cargo-audit + +### Code Review Checklist + +- [ ] Follows error handling patterns from guidelines +- [ ] API design is scalable and idiomatic +- [ ] Performance considerations addressed +- [ ] Proper documentation and examples included + +### AI Assistant Integration + +When using AI coding assistants, reference the guidelines file: +"Please follow the Microsoft Rust guidelines in `~/rust-guidelines.txt`" + +## コミュニケーション + +- 非自明なアルゴリズムやデータ変換を触る際は簡潔なコメントで意図を共有。冗長な説明は避ける。 +- 実行結果や差分を示す際はファイルパスをバッククオートで明示し、必要に応じて再現コマンドも提示。 +- 不確実な点や既存の変更がある場合は、即座にユーザへ確認を取りながらペアプロする姿勢を保つ。 + +## 参照スキルガイド (Skills) + +特定のタスクを実行する際は、必ず以下の対応するドキュメントを参照し、その指針に従ってください。 + +- **coding-standards** + - Rust コード変更時の設計指針・レビュー前手順 + - 📄 `.github/skills/coding-standards/SKILL.md` +- **testing-practices** + - テスト実行順序・品質ゲート・ログ共有手順 + - 📄 `.github/skills/testing-practices/SKILL.md` diff --git a/.github/instructions/code-review.instructions.md b/.github/instructions/code-review.instructions.md new file mode 100644 index 0000000..2329b14 --- /dev/null +++ b/.github/instructions/code-review.instructions.md @@ -0,0 +1,62 @@ +--- +applyTo: "**/*" +excludeAgent: "coding-agent" +--- + +# code-review instructions + +## 目的 + +- 本リポジトリのコードレビューで、バグ・回帰・設計崩れを早期に検知する。 +- 指摘は再現性と修正方針が分かる形で提示し、手戻りを減らす。 + +## レビュー時の基本姿勢 + +- まず重大度順に指摘を列挙する(Critical/High/Medium/Low)。 +- 概要説明は最後に短くまとめる。指摘がない場合は明示する。 +- 推測で断定せず、根拠(コード位置、想定実行経路、テスト観点)を添える。 + +## 必須チェック項目 + +1. **正しさ/回帰** + - 境界値、null相当、空配列、0件データ、例外経路を扱えているか。 + - 既存の振る舞いを壊す変更がないか(互換性、入出力形式、公開API)。 +2. **アーキテクチャ整合** + - ヘキサゴナル境界を維持できているか。 + - ロジックが `domain`/`use_case`、外部適合が `infrastructure`/`presenter` に分離されているか。 +3. **Rust品質** + - `unwrap`/`expect` の乱用がないか(テスト・初期化を除く)。 + - `Result` とエラー型で失敗が明示され、エラー文脈が不足していないか。 + - 不要な `clone` や過剰アロケーションがないか。 +4. **テスト妥当性** + - 変更に対応するユニット/統合テストが追加・更新されているか。 + - 失敗ケース・境界ケースを検証しているか。 +5. **可読性/保守性** + - 命名が意図を表しているか。 + - 複雑な処理に最小限の補助コメントがあるか。 + +## レビューコメントの書き方 + +- 1指摘につき以下を含める: + - 重大度 + - 対象ファイルと行(例: `src/use_case/interactors/...:42`) + - 何が問題か + - なぜ問題か(実害/将来リスク) + - 修正案(短く具体的に) + +## 出力テンプレート + +- Findings + - `[Severity] path:line` 問題点、影響、修正案 +- Open Questions / Assumptions + - 仕様不明点や確認事項 +- Final Note + - 指摘なしの場合は「重大な指摘なし」。 + - 残留リスクや未実施テストがあれば明記。 + +## 参照ドキュメント + +- `.github/copilot-instructions.md` +- `.github/skills/coding-standards/SKILL.md` +- `.github/skills/testing-practices/SKILL.md` +- `~/.rust/rust-guidelines.txt` diff --git a/.github/prompts/code-review.prompt.md b/.github/prompts/code-review.prompt.md new file mode 100644 index 0000000..db1fa3c --- /dev/null +++ b/.github/prompts/code-review.prompt.md @@ -0,0 +1,56 @@ +--- +mode: agent +description: PRレビュー時に概要把握と内容確認の見逃しを防ぐための、チェックリスト連動プロンプト +--- + +# PR コードレビュー + +レビュー対象の差分(または変更ファイル一覧)を提示してください。 +以下の手順に沿ってレビューを実施し、所定テンプレートで結果を出力します。 + +## レビュー手順 + +### Step 1 — 変更概要の把握 + +- 変更の目的・背景をコミットメッセージや PR 説明から読み取る。 +- 変更規模(追加/削除行数、影響モジュール)を確認する。 +- ヘキサゴナル境界(`domain`/`use_case`/`infrastructure`/`presenter`)のどの層が触れられているかを特定する。 + +### Step 2 — チェックリストの実施 + +`.github/instructions/code-review.instructions.md` の「必須チェック項目」を順に確認する。 + +- [ ] **正しさ/回帰**: 境界値・null相当・空配列・0件データ・例外経路 +- [ ] **アーキテクチャ整合**: ヘキサゴナル境界、レイヤ分離 +- [ ] **Rust品質**: `unwrap`/`expect` の乱用、`Result` とエラー文脈、不要な `clone` +- [ ] **テスト妥当性**: 対応するユニット/統合テストの有無、失敗ケースの網羅 +- [ ] **可読性/保守性**: 命名の意図明確さ、複雑処理への補助コメント + +### Step 3 — 結果の出力 + +下記テンプレートに沿って出力する。 + +--- + +## Findings + + + + +## Open Questions / Assumptions + + + +## Final Note + + + +--- + +## 参照ドキュメント + +- `.github/instructions/code-review.instructions.md` +- `.github/skills/coding-standards/SKILL.md` +- `.github/skills/testing-practices/SKILL.md` +- `~/.rust/rust-guidelines.txt` + diff --git a/.github/skills/coding-standards/SKILL.md b/.github/skills/coding-standards/SKILL.md new file mode 100644 index 0000000..f6d9cd5 --- /dev/null +++ b/.github/skills/coding-standards/SKILL.md @@ -0,0 +1,51 @@ +--- +name: coding-standards +description: Rust の設計原則と品質ゲートを一貫適用し、ヘキサゴナル境界を守った堅牢な変更を支援する。 +--- + +# coding-standards スキルガイド + +## 目的 + +- Rust コードを追加・変更するときに、Microsoft Pragmatic Rust Guidelines と本リポジトリの方針を一貫して適用する。 +- レビュー負担を減らし、ヘキサゴナルアーキテクチャを崩さない堅牢な変更を下支えする。 + +## 適用タイミング + +- `src/` や `tests/` 配下の Rust コードを作成・編集・削除するとき。 +- CLI/Presenter 層も含め、ビルドに影響する設定を触るとき。 + +## 主要ルール + +1. **設計指針**: ロジックは `domain`/`use_case`、外部適合は `infrastructure`/`presenter` に限定する。 +2. **エラー処理**: `Result` とカスタムエラー型を優先。`unwrap`/`expect` はテストや初期化コードのみで使用可。 +3. **API 設計**: Public API には意味のある型名、`&[T]`/`&str` のような参照を使う。破壊的変更はインタフェース層で吸収。 +4. **性能と相互運用性**: 不要なアロケーションを避け、`Iterator`/`Cow` など標準トレイトを活用。FFI 境界では `unsafe` を局所化。 +5. **ドキュメント**: 意図が読み取りづらい変換やアルゴリズムには短いコメントを残す。README/マニュアルとの齟齬を作らない。 + +## 作業手順 + +1. 変更前に `~/rust-guidelines.txt` を参照し、該当セクション(エラー処理・API 設計・性能)を確認。 +2. 実装ではレイヤリングと依存方向を常に意識し、必要ならユースケース→インフラの順で改修する。 +3. フォーマットと静的解析をローカルで実行: + ```bash + cargo fmt + cargo clippy --all-targets --all-features + cargo test + ``` + 追加でセキュリティ確認が必要な場合 `cargo audit` を走らせる。 +4. テストや CLI 出力の差異は ` +``path`` +` 表記と再現コマンドをセットで共有する。 + +## チェックリスト + +- [ ] エラー経路は Result/thiserror などで明示されているか。 +- [ ] 新規 API の命名・可視性はドメインモデルと整合しているか。 +- [ ] 不要な `clone`・`String` 化を避け、参照を渡しているか。 +- [ ] `cargo fmt`, `clippy`, `cargo test` を成功させたか (ログを確認したか)。 + +## 参考資料 + +- Microsoft Pragmatic Rust Guidelines: `~/rust-guidelines.txt` +- リポジトリ共通方針: `.github/copilot-instructions.md` diff --git a/.github/skills/testing-practices/SKILL.md b/.github/skills/testing-practices/SKILL.md new file mode 100644 index 0000000..44b78be --- /dev/null +++ b/.github/skills/testing-practices/SKILL.md @@ -0,0 +1,53 @@ +--- +name: testing-practices +description: Rust 変更を安全に統合するための標準テストフローと品質ゲートを定義する。 +--- + +# testing-practices スキルガイド + +## 目的 + +- Rust コードやビルド設定を触る際に、必要な検証手順を明示して品質を一定に保つ。 +- テスト結果の共有方法を統一し、レビューの手戻りを減らす。 + +## 適用タイミング + +- `src/` や `tests/` 配下のコードを変更・追加・削除するとき。 +- Cargo 設定や CI スクリプトを更新してビルド/テスト結果に影響が出るとき。 + +## 推奨コマンド + +```bash +cargo fmt +cargo clippy --all-targets --all-features +cargo test +cargo nextest run --all --all-features # 長時間テストやCI検証が必要な場合 +cargo audit # 依存パッケージの脆弱性チェック +``` + +## 実行手順 + +1. 変更内容に応じて必要なテストデータや API 資格情報を準備する。 +2. `cargo fmt` でフォーマッタ差分を解消し、`cargo clippy --all-targets --all-features` で警告が出ないことを確認。 +3. `cargo test` でユニット/統合テストを実行し、失敗した場合は該当ターゲットを `-- --nocapture` などで再実行して切り分ける。 +4. 長時間処理やCI互換が求められる変更は `cargo nextest run --all --all-features` を追加実行する。 +5. 依存を更新した場合やセキュリティリスクを懸念する場合は `cargo audit` を実施し、出力を記録する。 +6. レビュー提出時は成功したコマンドとログ要約を共有し、差分が生じたファイルパスはバッククオートで提示する。 + +## チェックリスト + +- [ ] フォーマッタと Clippy を警告ゼロで通過したか。 +- [ ] 追加・変更したロジックに対してユニットテスト/統合テストを更新したか。 +- [ ] `cargo test`/`cargo nextest run` の結果を確認し、失敗ケースを再現できるログを添付したか。 +- [ ] 依存更新時に `cargo audit` を実行し、CVE が残っていないか。 + +## 失敗時の切り分けメモ + +- Clippy が `allow` 無しで回避できない場合は `coding-standards` に立ち返り設計を再検討する。 +- 外部 API を叩くテストは `-- --ignored` 等で分離し、副作用がある場合はモックや固定データを使う。 +- 長時間テストが CI 限定の場合、ローカルでは対象モジュールに絞り `cargo test path::to::module` を使って最小範囲で再現する。 + +## 参考資料 + +- 共通方針: `.github/copilot-instructions.md` +- 設計ルール: `.github/skills/coding-standards/SKILL.md` diff --git a/.idea/developer-tools.xml b/.idea/developer-tools.xml new file mode 100644 index 0000000..897cddc --- /dev/null +++ b/.idea/developer-tools.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index e023470..f14702c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,6 +77,28 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "aws-lc-rs" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "base64" version = "0.22.1" @@ -117,9 +139,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.4" @@ -185,6 +215,25 @@ dependencies = [ "phf", ] +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "cookie" version = "0.18.1" @@ -353,6 +402,12 @@ dependencies = [ "litrs", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "either" version = "1.15.0" @@ -384,12 +439,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "fastrand" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" - [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -418,21 +467,6 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -442,6 +476,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures-channel" version = "0.3.32" @@ -457,17 +497,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" -[[package]] -name = "futures-macro" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "futures-sink" version = "0.3.32" @@ -480,12 +509,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.32" @@ -493,7 +516,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", - "futures-macro", "futures-task", "pin-project-lite", "slab", @@ -521,30 +543,11 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi 5.3.0", + "r-efi", "wasip2", "wasm-bindgen", ] -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "wasip2", - "wasip3", -] - -[[package]] -name = "glob" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - [[package]] name = "h2" version = "0.4.13" @@ -672,22 +675,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" @@ -819,12 +806,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "idna" version = "1.1.0" @@ -854,8 +835,6 @@ checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", "hashbrown 0.17.0", - "serde", - "serde_core", ] [[package]] @@ -898,6 +877,60 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys 0.3.1", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +dependencies = [ + "jni-sys 0.4.1", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.117", +] + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + [[package]] name = "js-sys" version = "0.3.95" @@ -910,12 +943,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" version = "0.2.185" @@ -931,12 +958,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" - [[package]] name = "litemap" version = "0.8.2" @@ -993,23 +1014,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "num-conv" version = "0.2.1" @@ -1031,50 +1035,12 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -[[package]] -name = "openssl" -version = "0.10.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe4646e360ec77dff7dde40ed3d6c5fee52d156ef4a62f53973d38294dad87f" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-sys" -version = "0.9.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2f2c0eba47118757e4c6d2bff2838f3e0523380021356e7875e858372ce644" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -1134,12 +1100,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkg-config" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" - [[package]] name = "potential_utf" version = "0.1.5" @@ -1174,25 +1134,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.117", -] - -[[package]] -name = "proc-macro-crate" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" -dependencies = [ - "toml_edit", -] - [[package]] name = "proc-macro2" version = "1.0.106" @@ -1220,7 +1161,7 @@ dependencies = [ [[package]] name = "quantitative-data-analysis-rs" -version = "0.34.0" +version = "0.35.0" dependencies = [ "anyhow", "async-trait", @@ -1238,12 +1179,11 @@ dependencies = [ "pretty_assertions", "query-string-builder", "rayon", - "reqwest", - "rstest", + "reqwest 0.13.2", "serde", "serde_json", - "simple_moving_average", "strum", + "ta", "thiserror 2.0.18", "tokio", "tokio-test", @@ -1286,6 +1226,7 @@ version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.3.4", "lru-slab", @@ -1330,12 +1271,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - [[package]] name = "rand" version = "0.9.4" @@ -1434,12 +1369,6 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" -[[package]] -name = "relative-path" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" - [[package]] name = "reqwest" version = "0.12.28" @@ -1450,6 +1379,44 @@ dependencies = [ "bytes", "cookie", "cookie_store", + "futures-core", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", +] + +[[package]] +name = "reqwest" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +dependencies = [ + "base64", + "bytes", "encoding_rs", "futures-core", "h2", @@ -1458,23 +1425,20 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", "mime", - "native-tls", "percent-encoding", "pin-project-lite", "quinn", "rustls", "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_json", - "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", "tower", "tower-http", @@ -1483,7 +1447,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", ] [[package]] @@ -1500,69 +1463,19 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rstest" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49" -dependencies = [ - "futures-timer", - "futures-util", - "rstest_macros", -] - -[[package]] -name = "rstest_macros" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0" -dependencies = [ - "cfg-if", - "glob", - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn 2.0.117", - "unicode-ident", -] - [[package]] name = "rustc-hash" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.61.2", -] - [[package]] name = "rustls" version = "0.23.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" dependencies = [ + "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", @@ -1571,6 +1484,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pki-types" version = "1.14.0" @@ -1581,12 +1506,40 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -1604,6 +1557,15 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.29" @@ -1642,12 +1604,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" - [[package]] name = "serde" version = "1.0.228" @@ -1719,15 +1675,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simple_moving_average" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4b144ad185430cd033299e2c93e465d5a7e65fbb858593dc57181fa13cd310" -dependencies = [ - "num-traits", -] - [[package]] name = "siphasher" version = "1.0.2" @@ -1785,18 +1732,18 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strum" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck", "proc-macro2", @@ -1883,17 +1830,10 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.27.0" +name = "ta" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" -dependencies = [ - "fastrand", - "getrandom 0.4.2", - "once_cell", - "rustix", - "windows-sys 0.61.2", -] +checksum = "609409d472a0a7d8d4dd9e19891bbdef546b9dce670c3057d0e02192dc541226" [[package]] name = "thiserror" @@ -2019,16 +1959,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -2074,36 +2004,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml_datetime" -version = "1.1.1+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" -dependencies = [ - "serde_core", -] - -[[package]] -name = "toml_edit" -version = "0.25.11+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" -dependencies = [ - "indexmap", - "toml_datetime", - "toml_parser", - "winnow", -] - -[[package]] -name = "toml_parser" -version = "1.1.2+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" -dependencies = [ - "winnow", -] - [[package]] name = "tower" version = "0.5.3" @@ -2196,12 +2096,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "untrusted" version = "0.9.0" @@ -2232,18 +2126,22 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -2265,16 +2163,7 @@ version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] @@ -2332,40 +2221,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-sys" version = "0.3.95" @@ -2386,6 +2241,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "1.0.7" @@ -2395,6 +2259,15 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "windows-core" version = "0.62.2" @@ -2465,6 +2338,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -2492,6 +2374,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -2525,6 +2422,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -2537,6 +2440,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -2549,6 +2458,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -2573,6 +2488,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -2585,6 +2506,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -2597,6 +2524,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -2609,6 +2542,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -2621,109 +2560,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -[[package]] -name = "winnow" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" -dependencies = [ - "memchr", -] - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn 2.0.117", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.117", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" version = "0.6.3" @@ -2736,7 +2578,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc75c0aef2fb5095c7fb103dc2aaec2d0bdeed8c4a34b2cd504f083e29f6f128" dependencies = [ - "reqwest", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index 04a1f33..60b3813 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quantitative-data-analysis-rs" -version = "0.34.0" +version = "0.35.0" edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,7 +10,6 @@ bytes = "1.10.1" bytestring = "1.5.0" anyhow = "1.0.100" thiserror = "2.0.17" -simple_moving_average = "1.0.2" csv = "1.4.0" serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.145" @@ -19,19 +18,19 @@ chrono-tz = "0.10.4" itertools = "0.14.0" charts-rs = "0.3.25" num-traits = "0.2.19" -strum = { version = "0.27.2", features = ["derive"] } +strum = { version = "0.28.0", features = ["derive"] } yahoo_finance_api = "4.1.0" tokio = { version = "1.48.0", features = ["full"] } async-trait = "0.1.89" tryhard = "0.5.2" -reqwest = { version = "0.12.24", features = ["json"] } +reqwest = { version = "0.13.2", features = ["json"] } query-string-builder = "0.6.0" rayon = "1.11.0" deref-derive = "0.1.0" dirs = "6.0.0" +ta = "=0.5.0" [dev-dependencies] indoc = "2.0.7" -rstest = "0.26.1" tokio-test = "0.4.4" pretty_assertions = "1.4.1" diff --git a/README.md b/README.md index 35d903d..c935bc9 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ and Yahoo Finance to produce chart-ready signals, summaries, and SVG/JSON artifa cargo fetch ``` +> This repository intentionally tracks `Cargo.lock` to keep CI and J-Quants connectivity checks reproducible. + ## Usage - **Financial indicators:** diff --git a/RUST_GUIDELINES.md b/RUST_GUIDELINES.md deleted file mode 100644 index 99d282a..0000000 --- a/RUST_GUIDELINES.md +++ /dev/null @@ -1,21 +0,0 @@ -# Rust Development Guidelines - -This project follows Microsoft's Pragmatic Rust Guidelines. - -## Quick Reference - -- Complete guidelines: `~/.rust/rust-guidelines.txt` -- Focus areas: Error handling, API design, performance, interoperability -- Tools: rustfmt, clippy, cargo-audit - -## Code Review Checklist - -- [ ] Follows error handling patterns from guidelines -- [ ] API design is scalable and idiomatic -- [ ] Performance considerations addressed -- [ ] Proper documentation and examples included - -## AI Assistant Integration - -When using AI coding assistants, reference the guidelines file: -"Please follow the Microsoft Rust guidelines in ~/.rust/rust-guidelines.txt" \ No newline at end of file diff --git a/assets/8473.T.financial_indicator_summary.json b/assets/8473.T.financial_indicator_summary.json index a82e94f..c2d6acd 100644 --- a/assets/8473.T.financial_indicator_summary.json +++ b/assets/8473.T.financial_indicator_summary.json @@ -1,14 +1,14 @@ [ { "close_date": "2025-08-27", - "disclosed_date": "2025-05-09", - "pbr": 1.6220124773886369, - "per": 12.594900110056146, + "disclosed_date": "2026-05-01", + "pbr": 2.4314095477477413, + "per": 10.125671095648, "oppr": null, "orpr": null, - "pr": 11.229223131978005, - "mix": 20.429085129974585, - "roe": 9.191554791293537, - "roa": 0.5048355158573843 + "pr": 22.544312026687656, + "mix": 24.61965337931188, + "roe": 17.717061212921553, + "roa": 1.116657352418128 } ] \ No newline at end of file diff --git a/assets/8473.T.ecp1_analysis.json b/assets/8473.T.high_low_direction_signal_analysis.json similarity index 100% rename from assets/8473.T.ecp1_analysis.json rename to assets/8473.T.high_low_direction_signal_analysis.json diff --git a/assets/8473.T.macos_analysis.json b/assets/8473.T.sma_cos_analysis.json similarity index 68% rename from assets/8473.T.macos_analysis.json rename to assets/8473.T.sma_cos_analysis.json index f916713..408814f 100644 --- a/assets/8473.T.macos_analysis.json +++ b/assets/8473.T.sma_cos_analysis.json @@ -1,6 +1,6 @@ [ { - "pattern": "GoldenCross", + "crossover_pattern": "GoldenCross", "latest_chance": "2023-08-30", "rate_of_chance": 27.27272727272727 } diff --git a/assets/8473.T.trend_reversal_analysis.json b/assets/8473.T.trend_reversal_analysis.json index 241d183..074c20d 100644 --- a/assets/8473.T.trend_reversal_analysis.json +++ b/assets/8473.T.trend_reversal_analysis.json @@ -1,9 +1,10 @@ [ { "type": "Stay", - "macos_date": "2023-08-30", - "ecp2_date": "1970-01-01", - "msesp_date": "1970-01-01", - "macps_date": "2023-09-08" + "sma_cos_date": "2023-08-30", + "sma_cps_date": "2023-09-08", + "body_engulfing_date": "1970-01-01", + "ms_es_date": "1970-01-01", + "macd_cos_date": "2023-08-30" } ] \ No newline at end of file diff --git a/assets/9223.T.ecp1_analysis.json b/assets/9223.T.high_low_direction_signal_analysis.json similarity index 100% rename from assets/9223.T.ecp1_analysis.json rename to assets/9223.T.high_low_direction_signal_analysis.json diff --git a/assets/9223.T.macos_analysis.json b/assets/9223.T.sma_cos_analysis.json similarity index 66% rename from assets/9223.T.macos_analysis.json rename to assets/9223.T.sma_cos_analysis.json index 23ff704..1d42020 100644 --- a/assets/9223.T.macos_analysis.json +++ b/assets/9223.T.sma_cos_analysis.json @@ -1,6 +1,6 @@ [ { - "pattern": "Neither", + "crossover_pattern": "Neither", "latest_chance": "1970-01-01", "rate_of_chance": 0.0 } diff --git a/assets/9223.T.trend_reversal_analysis.json b/assets/9223.T.trend_reversal_analysis.json index d289adc..2db0d29 100644 --- a/assets/9223.T.trend_reversal_analysis.json +++ b/assets/9223.T.trend_reversal_analysis.json @@ -1,9 +1,10 @@ [ { "type": "Stay", - "macos_date": "2024-02-07", - "ecp2_date": "1970-01-01", - "msesp_date": "2024-02-13", - "macps_date": "1970-01-01" + "sma_cos_date": "2024-02-07", + "sma_cps_date": "1970-01-01", + "body_engulfing_date": "1970-01-01", + "ms_es_date": "2024-02-13", + "macd_cos_date": "2024-02-05" } ] \ No newline at end of file diff --git a/assets/trend_summary.svg b/assets/trend_summary.svg deleted file mode 100644 index 5904cdd..0000000 --- a/assets/trend_summary.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - -code - - -symbol - - -macos type - - -latest - - -chance rate(All) - - - - -84730 - - - -Golden - - -2023-08-30 - - -27% - - \ No newline at end of file diff --git a/examples/financial_indicator.rs b/examples/financial_indicator.rs index 71a9a87..ff10c82 100644 --- a/examples/financial_indicator.rs +++ b/examples/financial_indicator.rs @@ -1,14 +1,13 @@ use anyhow::Result; use chrono::NaiveDate; use pretty_assertions::assert_eq; - use quantitative_data_analysis_rs::shared::jquants_api::setup::Setup; use quantitative_data_analysis_rs::{controller, infrastructure, presenter, use_case}; #[tokio::main] async fn main() -> Result<()> { // JQUANTS APIのためのトークン準備 - let token = Setup::run().await?; + let token = Setup::run()?; // JQUANTS APIを用いたレポジトリの準備 let jquants_api = infrastructure::jquants_api::JQuantsAPI::new(token)?; diff --git a/examples/make_companies.rs b/examples/make_companies.rs index 671b9b4..9ff53cf 100644 --- a/examples/make_companies.rs +++ b/examples/make_companies.rs @@ -1,15 +1,14 @@ use csv::WriterBuilder; -use tokio::fs::write; - use quantitative_data_analysis_rs::domain::repositories::company::repository::Company; use quantitative_data_analysis_rs::infrastructure::jquants_api::JQuantsAPI; use quantitative_data_analysis_rs::infrastructure::repositories::company::structures::internal::tsv; use quantitative_data_analysis_rs::shared::jquants_api::setup::Setup; +use tokio::fs::write; #[tokio::main] async fn main() -> anyhow::Result<()> { // JQUANTS APIのためのトークン準備 - let token = Setup::run().await?; + let token = Setup::run()?; let jquants_api = JQuantsAPI::new(token)?; let companies = jquants_api.get_companies().await?; diff --git a/examples/trend_analysis.rs b/examples/trend_analysis.rs index 11475cc..e72d1ca 100644 --- a/examples/trend_analysis.rs +++ b/examples/trend_analysis.rs @@ -1,23 +1,25 @@ use anyhow::Result; use bytes::Bytes; use chrono::NaiveDate; -use itertools::{Itertools, multiunzip}; -use tokio::fs::write; - +use itertools::{multiunzip, Itertools}; use quantitative_data_analysis_rs::infrastructure::repositories::company::structures::internal::tsv; -use quantitative_data_analysis_rs::presenter::views::buy_sell_signal_analysis::view::BuySellSignalAnalysis; -use quantitative_data_analysis_rs::presenter::views::macos_analysis::view::MACOSAnalysis; +use quantitative_data_analysis_rs::presenter::views::high_low_direction_signal_analysis::view::HighLowDirectionSignalAnalysis; use quantitative_data_analysis_rs::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; +use quantitative_data_analysis_rs::presenter::views::sma_cos_analysis::view::SmaCosAnalysis; use quantitative_data_analysis_rs::presenter::views::trend_analysis_summary::json::view::JsonRow; use quantitative_data_analysis_rs::presenter::views::trend_reversal_analysis::view::TrendReversalAnalysis; use quantitative_data_analysis_rs::shared::jquants_api::setup::Setup; use quantitative_data_analysis_rs::{controller, infrastructure, presenter, use_case}; +use tokio::fs::write; const AFTER_DAYS_5: usize = 5; const FROM_END_DAYS_7: isize = 7; const MARUBOZU_BODY_MIN_RATIO: usize = 90; const MARUBOZU_WICK_MAX_RATIO: usize = 2; const DOJI_MAX_BODY_RATIO: usize = 5; +const FAST_PERIOD_12: usize = 12; +const SLOW_PERIOD_26: usize = 26; +const SIGNAL_PERIOD_9: usize = 9; const DATE_FORMAT: &str = "%Y/%m/%d"; const COMPANIES_TSV: &[u8] = include_bytes!("../assets/companies.tsv"); @@ -25,7 +27,7 @@ const COMPANIES_TSV: &[u8] = include_bytes!("../assets/companies.tsv"); #[tokio::main] async fn main() -> Result<()> { // JQUANTS APIのためのトークン準備 - let token = Setup::run().await?; + let token = Setup::run()?; // DSVを用いたレポジトリの準備 let dsv = infrastructure::dsv::Dsv::::new(false, Bytes::from(COMPANIES_TSV)); @@ -45,7 +47,16 @@ async fn main() -> Result<()> { let controller = controller::trend_analysis::controller::TrendAnalysis::new(&interactor, &presenter); let trend_analysis = controller - .analyze::( + .analyze::< + AFTER_DAYS_5, + FROM_END_DAYS_7, + MARUBOZU_BODY_MIN_RATIO, + MARUBOZU_WICK_MAX_RATIO, + DOJI_MAX_BODY_RATIO, + FAST_PERIOD_12, + SLOW_PERIOD_26, + SIGNAL_PERIOD_9, + >( "84730", "T", NaiveDate::from_ymd_opt(2022, 9, 9).unwrap(), @@ -70,7 +81,16 @@ async fn main() -> Result<()> { let controller = controller::trend_analysis::controller::TrendAnalysis::new(&interactor, &presenter); let trend_analysis = controller - .analyze::( + .analyze::< + AFTER_DAYS_5, + FROM_END_DAYS_7, + MARUBOZU_BODY_MIN_RATIO, + MARUBOZU_WICK_MAX_RATIO, + DOJI_MAX_BODY_RATIO, + FAST_PERIOD_12, + SLOW_PERIOD_26, + SIGNAL_PERIOD_9, + >( "84730", "T", NaiveDate::from_ymd_opt(2022, 9, 9).unwrap(), @@ -102,22 +122,26 @@ async fn main() -> Result<()> { .iter() .map(|row| { let JsonRow { - macos_analysis, + sma_cos_analysis, trend_reversal_analysis, - ecp1_analysis, + high_low_direction_signal_analysis, .. } = row; - (macos_analysis, trend_reversal_analysis, ecp1_analysis) + ( + sma_cos_analysis, + trend_reversal_analysis, + high_low_direction_signal_analysis, + ) }) .collect_vec(); - let (macos_analysis, trend_reversal_analysis, ecp1_analysis): ( - Vec<&MACOSAnalysis>, + let (sma_cos_analysis, trend_reversal_analysis, high_low_direction_signal_analysis): ( + Vec<&SmaCosAnalysis>, Vec<&TrendReversalAnalysis>, - Vec<&BuySellSignalAnalysis>, + Vec<&HighLowDirectionSignalAnalysis>, ) = multiunzip(tuples); - let json_str = serde_json::to_string_pretty(&macos_analysis)?; + let json_str = serde_json::to_string_pretty(&sma_cos_analysis)?; assert_eq!( - include_str!("../assets/8473.T.macos_analysis.json"), + include_str!("../assets/8473.T.sma_cos_analysis.json"), &json_str ); let json_str = serde_json::to_string_pretty(&trend_reversal_analysis)?; @@ -125,9 +149,9 @@ async fn main() -> Result<()> { include_str!("../assets/8473.T.trend_reversal_analysis.json"), &json_str ); - let json_str = serde_json::to_string_pretty(&ecp1_analysis)?; + let json_str = serde_json::to_string_pretty(&high_low_direction_signal_analysis)?; assert_eq!( - include_str!("../assets/8473.T.ecp1_analysis.json"), + include_str!("../assets/8473.T.high_low_direction_signal_analysis.json"), &json_str ); }; @@ -140,7 +164,16 @@ async fn main() -> Result<()> { let controller = controller::trend_analysis::controller::TrendAnalysis::new(&interactor, &presenter); let trend_analysis = controller - .analyze::( + .analyze::< + AFTER_DAYS_5, + FROM_END_DAYS_7, + MARUBOZU_BODY_MIN_RATIO, + MARUBOZU_WICK_MAX_RATIO, + DOJI_MAX_BODY_RATIO, + FAST_PERIOD_12, + SLOW_PERIOD_26, + SIGNAL_PERIOD_9, + >( "92230", "T", NaiveDate::from_ymd_opt(2023, 12, 25).unwrap(), @@ -170,22 +203,26 @@ async fn main() -> Result<()> { .iter() .map(|row| { let JsonRow { - macos_analysis, + sma_cos_analysis, trend_reversal_analysis, - ecp1_analysis, + high_low_direction_signal_analysis, .. } = row; - (macos_analysis, trend_reversal_analysis, ecp1_analysis) + ( + sma_cos_analysis, + trend_reversal_analysis, + high_low_direction_signal_analysis, + ) }) .collect_vec(); - let (macos_analysis, trend_reversal_analysis, ecp1_analysis): ( - Vec<&MACOSAnalysis>, + let (sma_cos_analysis, trend_reversal_analysis, high_low_direction_signal_analysis): ( + Vec<&SmaCosAnalysis>, Vec<&TrendReversalAnalysis>, - Vec<&BuySellSignalAnalysis>, + Vec<&HighLowDirectionSignalAnalysis>, ) = multiunzip(tuples); - let json_str = serde_json::to_string_pretty(&macos_analysis)?; + let json_str = serde_json::to_string_pretty(&sma_cos_analysis)?; assert_eq!( - include_str!("../assets/9223.T.macos_analysis.json"), + include_str!("../assets/9223.T.sma_cos_analysis.json"), &json_str ); let json_str = serde_json::to_string_pretty(&trend_reversal_analysis)?; @@ -193,9 +230,9 @@ async fn main() -> Result<()> { include_str!("../assets/9223.T.trend_reversal_analysis.json"), &json_str ); - let json_str = serde_json::to_string_pretty(&ecp1_analysis)?; + let json_str = serde_json::to_string_pretty(&high_low_direction_signal_analysis)?; assert_eq!( - include_str!("../assets/9223.T.ecp1_analysis.json"), + include_str!("../assets/9223.T.high_low_direction_signal_analysis.json"), &json_str ); }; diff --git a/src/controller/trend_analysis/controller.rs b/src/controller/trend_analysis/controller.rs index 9aa35eb..59a90d4 100644 --- a/src/controller/trend_analysis/controller.rs +++ b/src/controller/trend_analysis/controller.rs @@ -31,6 +31,9 @@ where const MARUBOZU_BODY_MIN_RATIO: usize, const MARUBOZU_WICK_MAX_RATIO: usize, const DOJI_MAX_BODY_RATIO: usize, + const FAST_PERIOD: usize, + const SLOW_PERIOD: usize, + const SIGNAL_PERIOD: usize, >( &self, code: impl Into, @@ -43,7 +46,16 @@ where input::TrendAnalysis::new(code, market, start_date, end_date, crossover_pattern_filter); let output = self .interactor - .handle::( + .handle::< + AFTER_DAYS, + FROM_END_DAYS, + MARUBOZU_BODY_MIN_RATIO, + MARUBOZU_WICK_MAX_RATIO, + DOJI_MAX_BODY_RATIO, + FAST_PERIOD, + SLOW_PERIOD, + SIGNAL_PERIOD, + >( input, ) .await?; diff --git a/src/domain/models.rs b/src/domain/models.rs index b79c20a..68ebea3 100644 --- a/src/domain/models.rs +++ b/src/domain/models.rs @@ -1,15 +1,16 @@ +pub mod body_engulfing; pub mod buy_sell_signal; pub mod candle_stick; +pub mod close; pub mod company; -pub mod ecp1; -pub mod ecp2; +pub mod crossover_strategy; pub mod financial_indicator; -pub mod macos; -pub mod macos_analysis; -pub mod macps; -pub mod msesp; +pub mod high_low_direction_signal; +pub mod macd; +pub mod ms_es; pub mod sma; pub mod statement; pub mod stock; -pub mod stocks_macoses_pair; +pub mod stocks_sma_coses_pair; pub mod trend_reversal_analysis; +pub mod volume; diff --git a/src/domain/models/ecp1.rs b/src/domain/models/body_engulfing.rs similarity index 100% rename from src/domain/models/ecp1.rs rename to src/domain/models/body_engulfing.rs diff --git a/src/domain/models/ecp2/model.rs b/src/domain/models/body_engulfing/model.rs similarity index 89% rename from src/domain/models/ecp2/model.rs rename to src/domain/models/body_engulfing/model.rs index 6374ca1..d5fd1b0 100644 --- a/src/domain/models/ecp2/model.rs +++ b/src/domain/models/body_engulfing/model.rs @@ -1,28 +1,27 @@ -use deref_derive::{Deref, DerefMut}; -use itertools::Itertools; -use std::cmp::Ordering; - use crate::domain::models::buy_sell_signal::model::{BuySellSignal, BuySellSignalType}; use crate::domain::models::candle_stick::model::{BullishBearishType, CandleStick}; +use deref_derive::{Deref, DerefMut}; +use rayon::prelude::*; +use std::cmp::Ordering; #[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)] -pub struct ECP2 { +pub struct BodyEngulfing { body_low_ordering: Option, body_high_ordering: Option, prev_bullish_bearish: BullishBearishType, today_bullish_bearish: BullishBearishType, } -/// Engulfing Candlestick Pattern2 +/// Body Engulfing /// /// ある日の始値と終値の間にその前日の始値と終値が飲み込まれているかをみる /// /// * **Buy**: ある日の始値と終値の間にその前日の始値と終値が飲み込まれており、前日がBearishCandleで当日がBullishCandleのとき /// * **Sell**: ある日の始値と終値の間にその前日の始値と終値が飲み込まれており、前日がBullishCandleで当日がBearishCandleのとき /// * **Stay**: 上記のどちらにもあてはまならない -impl From for BuySellSignalType { - fn from(value: ECP2) -> Self { - let ECP2 { +impl From for BuySellSignalType { + fn from(value: BodyEngulfing) -> Self { + let BodyEngulfing { body_low_ordering, body_high_ordering, prev_bullish_bearish, @@ -52,16 +51,16 @@ impl From for BuySellSignalType { } #[derive(Default, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Deref, DerefMut)] -pub struct ECP2s(Vec); +pub struct BodyEngulfings(Vec); -impl From<&[CandleStick]> for ECP2s { +impl From<&[CandleStick]> for BodyEngulfings { /// /// # Examples /// ``` /// use bytes::Bytes; /// /// use quantitative_data_analysis_rs::domain::models::candle_stick::model::CandleSticks; - /// use quantitative_data_analysis_rs::domain::models::ecp2::model::ECP2s; + /// use quantitative_data_analysis_rs::domain::models::body_engulfing::model::BodyEngulfings; /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; /// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; @@ -79,31 +78,31 @@ impl From<&[CandleStick]> for ECP2s { /// }; /// let stocks = dsv.get_stocks(&query).await.unwrap(); /// let candle_sticks = CandleSticks::::try_from(stocks.as_slice()).unwrap(); - /// let ecp2s = ECP2s::from(candle_sticks.as_slice()); - /// assert_eq!(ecp2s.len(), 34); + /// let body_engulfings = BodyEngulfings::from(candle_sticks.as_slice()); + /// assert_eq!(body_engulfings.len(), 34); /// }); /// ``` fn from(value: &[CandleStick]) -> Self { let vec = value - .windows(2) + .par_windows(2) .map(|candle_sticks| { let prev = candle_sticks.first().unwrap(); let today = candle_sticks.get(1).unwrap(); let body_high_ordering = today.body_high.partial_cmp(&prev.body_high); let body_low_ordering = today.body_low.partial_cmp(&prev.body_low); - let ecp2 = ECP2 { + let body_engulfing = BodyEngulfing { body_low_ordering, body_high_ordering, prev_bullish_bearish: prev.bullish_bearish, today_bullish_bearish: today.bullish_bearish, }; - let r#type = BuySellSignalType::from(ecp2); + let r#type = BuySellSignalType::from(body_engulfing); let date = today.date; BuySellSignal { r#type, date } }) - .collect_vec(); - ECP2s(vec) + .collect(); + BodyEngulfings(vec) } } @@ -114,13 +113,13 @@ mod tests { use chrono::NaiveDate; use pretty_assertions::assert_eq; + use crate::domain::models::body_engulfing::model::BodyEngulfings; use crate::domain::models::buy_sell_signal::model::tests::TupleVecBuySellSignal; use crate::domain::models::buy_sell_signal::model::{ BuySellSignal, BuySellSignalType::{Buy, Sell}, }; use crate::domain::models::candle_stick::model::CandleSticks; - use crate::domain::models::ecp2::model::ECP2s; use crate::domain::repositories::stock::queries; use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::dsv::Dsv; @@ -143,9 +142,9 @@ mod tests { MARUBOZU_WICK_MAX_RATIO, DOJI_MAX_BODY_RATIO, >::try_from(stocks.as_slice())?; - let vec_ecp2 = ECP2s::from(candle_sticks.as_slice()); + let body_engulfings = BodyEngulfings::from(candle_sticks.as_slice()); let (actual_buy, actual_sell): (Vec<_>, Vec<_>) = - TupleVecBuySellSignal::from(vec_ecp2.0.as_slice()).0; + TupleVecBuySellSignal::from(body_engulfings.0.as_slice()).0; let (expected_buy, expected_sell): (Vec, Vec) = ( vec![ BuySellSignal { diff --git a/src/domain/models/buy_sell_signal/model.rs b/src/domain/models/buy_sell_signal/model.rs index ed2a009..e2d7bcf 100644 --- a/src/domain/models/buy_sell_signal/model.rs +++ b/src/domain/models/buy_sell_signal/model.rs @@ -1,3 +1,4 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; use chrono::NaiveDate; use serde::{Deserialize, Serialize}; use strum::Display; @@ -13,6 +14,16 @@ pub enum BuySellSignalType { Sell, } +impl From for BuySellSignalType { + fn from(crossover_pattern: CrossoverPattern) -> Self { + match crossover_pattern { + CrossoverPattern::Neither => Self::Stay, + CrossoverPattern::GoldenCross => Self::Buy, + CrossoverPattern::DeadCross => Self::Sell, + } + } +} + /// 売買シグナル #[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)] pub struct BuySellSignal { diff --git a/src/domain/models/macos_analysis/close.rs b/src/domain/models/close.rs similarity index 100% rename from src/domain/models/macos_analysis/close.rs rename to src/domain/models/close.rs diff --git a/src/domain/models/close/model.rs b/src/domain/models/close/model.rs new file mode 100644 index 0000000..8293be9 --- /dev/null +++ b/src/domain/models/close/model.rs @@ -0,0 +1,2 @@ +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct F64(pub f64); diff --git a/src/domain/models/crossover_strategy.rs b/src/domain/models/crossover_strategy.rs new file mode 100644 index 0000000..39dab9e --- /dev/null +++ b/src/domain/models/crossover_strategy.rs @@ -0,0 +1,7 @@ +pub(crate) mod analysis_pattern; +pub mod crossover_pattern; +pub mod latest_chance; +pub mod macd_cos; +pub mod rate_of_chance; +pub mod sma_cos; +pub mod sma_cps; diff --git a/src/domain/models/crossover_strategy/analysis_pattern.rs b/src/domain/models/crossover_strategy/analysis_pattern.rs new file mode 100644 index 0000000..d9a5251 --- /dev/null +++ b/src/domain/models/crossover_strategy/analysis_pattern.rs @@ -0,0 +1 @@ +pub(crate) mod model; diff --git a/src/domain/models/crossover_strategy/analysis_pattern/model.rs b/src/domain/models/crossover_strategy/analysis_pattern/model.rs new file mode 100644 index 0000000..c1c4483 --- /dev/null +++ b/src/domain/models/crossover_strategy/analysis_pattern/model.rs @@ -0,0 +1,67 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; + +/// A pair of `CrossoverPattern` and `rate_of_change` values. +pub(crate) struct CrossoverPatternRateOfChangePair { + pub crossover_pattern: CrossoverPattern, + pub rate_of_change: f64, +} + +/// Analysis with combination of Crossover pattern and rate_of_change +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +pub enum AnalysisPattern { + #[default] + None, + GoldenChance, + DeadChance, + GoldenLoss, + DeadLoss, +} + +/// Converts a `PatternRateOfChangePair` into an `AnalysisPattern`. +/// +/// # Parameters +/// - `value: PatternRateOfChangePair` +/// The input object containing a `CrossoverPattern` (either `GoldenCross` or `DeadCross`) and a `rate_of_change` value for evaluation. +/// +/// # Returns +/// - `AnalysisPattern`: +/// - Returns `AnalysisPattern::GoldenChance` if the `CrossoverPattern` is `GoldenCross` and the `rate_of_change` is greater than `0.0`. +/// - Returns `AnalysisPattern::DeadChance` if the `CrossoverPattern` is `DeadCross` and the `rate_of_change` is less than `0.0`. +/// - Returns `AnalysisPattern::GoldenLoss` if the `CrossoverPattern` is `GoldenCross` and the `rate_of_change` is less than or equal to `0.0`. +/// - Returns `AnalysisPattern::DeadLoss` if the `CrossoverPattern` is `DeadCross` and the `rate_of_change` is greater than or equal to `0.0`. +/// - Returns `AnalysisPattern::None` if none of the above conditions are met. +/// +/// # Behavior +/// - The conversion logic evaluates both the `CrossoverPattern` and the `rate_of_change` value +/// based on specific conditions to determine the appropriate `AnalysisPattern` variant. +/// +/// # Notes +/// - This implementation provides a structured way to classify input `PatternRateOfChangePair` values into `AnalysisPattern` variants, +/// reflecting specific conditions of the pattern and its associated rate of change. +impl From for AnalysisPattern { + fn from(value: CrossoverPatternRateOfChangePair) -> Self { + match value { + // GoldenChance: GoldenPattern/rate_of_change > 0.0 + CrossoverPatternRateOfChangePair { + crossover_pattern: CrossoverPattern::GoldenCross, + rate_of_change: change, + } if change > 0.0 => AnalysisPattern::GoldenChance, + // DeadChance: DeadPattern/rate_of_change < 0.0 + CrossoverPatternRateOfChangePair { + crossover_pattern: CrossoverPattern::DeadCross, + rate_of_change: change, + } if change < 0.0 => AnalysisPattern::DeadChance, + // GoldenLoss: GoldenPattern/rate_of_change <= 0.0 + CrossoverPatternRateOfChangePair { + crossover_pattern: CrossoverPattern::GoldenCross, + rate_of_change: change, + } if change <= 0.0 => AnalysisPattern::GoldenLoss, + // DeadLoss: DeadPattern/rate_of_change >= 0.0 + CrossoverPatternRateOfChangePair { + crossover_pattern: CrossoverPattern::DeadCross, + rate_of_change: change, + } if change >= 0.0 => AnalysisPattern::DeadLoss, + _ => AnalysisPattern::None, + } + } +} diff --git a/src/domain/models/crossover_strategy/crossover_pattern.rs b/src/domain/models/crossover_strategy/crossover_pattern.rs new file mode 100644 index 0000000..7bec4e8 --- /dev/null +++ b/src/domain/models/crossover_strategy/crossover_pattern.rs @@ -0,0 +1,3 @@ +pub mod close; +pub mod model; +pub mod volume; diff --git a/src/domain/models/ecp2.rs b/src/domain/models/crossover_strategy/crossover_pattern/close.rs similarity index 100% rename from src/domain/models/ecp2.rs rename to src/domain/models/crossover_strategy/crossover_pattern/close.rs diff --git a/src/domain/models/crossover_strategy/crossover_pattern/close/model.rs b/src/domain/models/crossover_strategy/crossover_pattern/close/model.rs new file mode 100644 index 0000000..bdd64e2 --- /dev/null +++ b/src/domain/models/crossover_strategy/crossover_pattern/close/model.rs @@ -0,0 +1,4 @@ +use crate::domain::models::crossover_strategy::crossover_pattern; + +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +pub struct CrossoverPattern(pub crossover_pattern::model::CrossoverPattern); diff --git a/src/domain/models/crossover_strategy/crossover_pattern/model.rs b/src/domain/models/crossover_strategy/crossover_pattern/model.rs new file mode 100644 index 0000000..9014f3f --- /dev/null +++ b/src/domain/models/crossover_strategy/crossover_pattern/model.rs @@ -0,0 +1,41 @@ +use serde::{Deserialize, Serialize}; +use std::cmp::Ordering; +use strum::Display; + +/// 各移動平均線が交わったときの向きのパターン +#[derive( + Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Display, +)] +pub enum CrossoverPattern { + #[default] + Neither, + GoldenCross, + DeadCross, +} + +/// Creates a `CrossoverPattern` from a tuple of two `Option` values. +/// +/// # Parameters +/// - `value: (Option, Option)` +/// A tuple containing two optional `Ordering` values, which represent comparisons. +/// +/// # Returns +/// - `Pattern`: +/// - Returns `CrossoverPattern::GoldenCross` if the first value is `Some(Ordering::Less)` and the second is `Some(Ordering::Greater)`. +/// - Returns `CrossoverPattern::DeadCross` if the first value is `Some(Ordering::Greater)` and the second is `Some(Ordering::Less)`. +/// - Returns `CrossoverPattern::Neither` for all other cases. +/// +/// # Behavior +/// - The function pattern matches on the provided tuple of `Option` values to determine which `CrossoverPattern` variant to return. +/// +/// # Notes +/// - Provides a convenient way to map comparison results (`Ordering`) into a `CrossoverPattern` variant. +impl From<(Option, Option)> for CrossoverPattern { + fn from(value: (Option, Option)) -> Self { + match value { + (Some(Ordering::Less), Some(Ordering::Greater)) => Self::GoldenCross, + (Some(Ordering::Greater), Some(Ordering::Less)) => Self::DeadCross, + _ => Self::Neither, + } + } +} diff --git a/src/domain/models/macos_analysis/volume.rs b/src/domain/models/crossover_strategy/crossover_pattern/volume.rs similarity index 100% rename from src/domain/models/macos_analysis/volume.rs rename to src/domain/models/crossover_strategy/crossover_pattern/volume.rs diff --git a/src/domain/models/crossover_strategy/crossover_pattern/volume/model.rs b/src/domain/models/crossover_strategy/crossover_pattern/volume/model.rs new file mode 100644 index 0000000..bdd64e2 --- /dev/null +++ b/src/domain/models/crossover_strategy/crossover_pattern/volume/model.rs @@ -0,0 +1,4 @@ +use crate::domain::models::crossover_strategy::crossover_pattern; + +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +pub struct CrossoverPattern(pub crossover_pattern::model::CrossoverPattern); diff --git a/src/domain/models/macos.rs b/src/domain/models/crossover_strategy/latest_chance.rs similarity index 100% rename from src/domain/models/macos.rs rename to src/domain/models/crossover_strategy/latest_chance.rs diff --git a/src/domain/models/crossover_strategy/latest_chance/model.rs b/src/domain/models/crossover_strategy/latest_chance/model.rs new file mode 100644 index 0000000..0bd0de4 --- /dev/null +++ b/src/domain/models/crossover_strategy/latest_chance/model.rs @@ -0,0 +1,53 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern::{ + DeadCross, GoldenCross, Neither, +}; +use chrono::NaiveDate; + +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +pub struct LatestChance { + pub golden_cross: Option, + pub dead_cross: Option, +} + +impl From for CrossoverPattern { + fn from(value: LatestChance) -> Self { + let LatestChance { + golden_cross: latest_golden_chance, + dead_cross: latest_dead_chance, + } = value; + match (latest_golden_chance, latest_dead_chance) { + (Some(golden), Some(dead)) => { + if golden >= dead { + GoldenCross + } else { + DeadCross + } + } + (Some(_), None) => GoldenCross, + (None, Some(_)) => DeadCross, + _ => Neither, + } + } +} + +impl From for NaiveDate { + fn from(value: LatestChance) -> Self { + let LatestChance { + golden_cross: latest_golden_chance, + dead_cross: latest_dead_chance, + } = value; + match (latest_golden_chance, latest_dead_chance) { + (Some(golden), Some(dead)) => { + if golden >= dead { + golden + } else { + dead + } + } + (Some(golden), None) => golden, + (None, Some(dead)) => dead, + _ => NaiveDate::default(), + } + } +} diff --git a/src/domain/models/macps.rs b/src/domain/models/crossover_strategy/macd_cos.rs similarity index 100% rename from src/domain/models/macps.rs rename to src/domain/models/crossover_strategy/macd_cos.rs diff --git a/src/domain/models/crossover_strategy/macd_cos/model.rs b/src/domain/models/crossover_strategy/macd_cos/model.rs new file mode 100644 index 0000000..8174491 --- /dev/null +++ b/src/domain/models/crossover_strategy/macd_cos/model.rs @@ -0,0 +1,79 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::macd::model::{MACD, MACDs}; +use chrono::NaiveDate; +use deref_derive::{Deref, DerefMut}; +use rayon::prelude::*; + +/// MACD Crossover Strategy +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct MacdCos { + pub date: NaiveDate, + pub macd: f64, + pub signal: f64, + pub histogram: f64, + pub crossover_pattern: CrossoverPattern, +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, Deref, DerefMut)] +pub struct MacdCoses(Vec); + +impl From> for MacdCoses { + /// + /// # Examples + /// ``` + /// use bytes::Bytes; + /// use chrono::NaiveDate; + /// use rayon::prelude::*; + /// + /// use quantitative_data_analysis_rs::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; + /// use quantitative_data_analysis_rs::domain::models::crossover_strategy::macd_cos::model::{ MacdCos, MacdCoses }; + /// use quantitative_data_analysis_rs::domain::models::macd::model::MACDs; + /// use quantitative_data_analysis_rs::domain::models::stock::model; + /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; + /// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; + /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; + /// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; + /// + /// const FAST_PERIOD: usize = 12; + /// const SLOW_PERIOD: usize = 26; + /// const SIGNAL_PERIOD: usize = 9; + /// const CSV: &[u8] = include_bytes!("../../../../../assets/8473.T.csv"); + /// + /// tokio_test::block_on(async { + /// let dsv = Dsv::::new(true, Bytes::from(CSV)); + /// let query = queries::get_stocks::Query { + /// ..Default::default() + /// }; + /// let stocks = dsv.get_stocks(&query).await.unwrap(); + /// let macds = MACDs::::from(stocks.as_slice()); + /// let macd_coses = MacdCoses::from(macds); + /// assert_eq!(macd_coses.len(), 245); + /// }); + /// ``` + fn from(value: MACDs) -> Self { + let vec_macd_cos = value + .as_slice() + .par_windows(2) + .map(|windows| { + // 昨日と今日のMACDとシグナルの比較からクロスオーバーパターンを判定 + let yesterday = windows[0].macd.partial_cmp(&windows[0].signal); + let target = windows[1].macd.partial_cmp(&windows[1].signal); + let crossover_pattern = CrossoverPattern::from((yesterday, target)); + let MACD { + date, + macd, + signal, + histogram, + } = windows[1]; + MacdCos { + date, + macd, + signal, + histogram, + crossover_pattern, + } + }) + .collect::>(); + Self(vec_macd_cos) + } +} diff --git a/src/domain/models/msesp.rs b/src/domain/models/crossover_strategy/rate_of_chance.rs similarity index 100% rename from src/domain/models/msesp.rs rename to src/domain/models/crossover_strategy/rate_of_chance.rs diff --git a/src/domain/models/crossover_strategy/rate_of_chance/model.rs b/src/domain/models/crossover_strategy/rate_of_chance/model.rs new file mode 100644 index 0000000..20746dc --- /dev/null +++ b/src/domain/models/crossover_strategy/rate_of_chance/model.rs @@ -0,0 +1,6 @@ +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct RateOfChance { + pub whole: f64, + pub golden: f64, + pub dead: f64, +} diff --git a/src/domain/models/crossover_strategy/sma_cos.rs b/src/domain/models/crossover_strategy/sma_cos.rs new file mode 100644 index 0000000..35c181d --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos.rs @@ -0,0 +1,2 @@ +pub(crate) mod analysis_result; +pub mod model; diff --git a/src/domain/models/macos_analysis.rs b/src/domain/models/crossover_strategy/sma_cos/analysis_result.rs similarity index 100% rename from src/domain/models/macos_analysis.rs rename to src/domain/models/crossover_strategy/sma_cos/analysis_result.rs diff --git a/src/domain/models/crossover_strategy/sma_cos/analysis_result/close.rs b/src/domain/models/crossover_strategy/sma_cos/analysis_result/close.rs new file mode 100644 index 0000000..d9a5251 --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos/analysis_result/close.rs @@ -0,0 +1 @@ +pub(crate) mod model; diff --git a/src/domain/models/crossover_strategy/sma_cos/analysis_result/close/model.rs b/src/domain/models/crossover_strategy/sma_cos/analysis_result/close/model.rs new file mode 100644 index 0000000..ed975f3 --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos/analysis_result/close/model.rs @@ -0,0 +1,201 @@ +use crate::domain::models::crossover_strategy::analysis_pattern::model::{ + AnalysisPattern, CrossoverPatternRateOfChangePair, +}; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern::Neither; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; +use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; +use crate::shared::float::percentage; +use chrono::NaiveDate; +use deref_derive::{Deref, DerefMut}; +use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator}; +use std::ops::{Mul, Sub}; + +/// 終値ベースの解析結果 +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct AnalysisResult { + /// Crossover発生日 + pub date_of_event: NaiveDate, + /// Crossover発生日の終値 + pub close: f64, + /// N日後の終値 + pub close_after_n_days: f64, + /// CrossoverPattern + pub pattern: CrossoverPattern, + /// 増減率 + pub rate_of_change: f64, + /// 分析パターン + pub analysis_pattern: AnalysisPattern, +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] +pub struct AnalysisResults(Vec); + +impl<'a, const N: usize> From<&StocksSmaCosesPair<'a>> for AnalysisResults { + fn from(value: &StocksSmaCosesPair<'a>) -> Self { + let StocksSmaCosesPair { stocks, sma_coses } = value; + let vec_analysis_result: Vec = sma_coses + .par_iter() + .filter_map(|sma_cos| { + if sma_cos.crossover_pattern_close.0.eq(&Neither) { + return None; + } + // Crossoverが発生した日を特定 + let (stock, sma_cos) = stocks.par_iter().find_map_first(|stock| { + if stock.date.eq(&sma_cos.date) { + Some((stock, sma_cos)) + } else { + None + } + })?; + // n日後のStockを取得。stocksは営業日で並んでいる。 + let (stock, sma_cos, stock_after_n_days) = stocks + .par_iter() + .enumerate() + .find_first(|(_, stock)| stock.date.eq(&sma_cos.date)) + .and_then(|(index, _)| { + let stock_after_n_days = stocks.get(index + N)?; + Some((stock, sma_cos, stock_after_n_days)) + })?; + // 増減率を取得 + let rate_of_change = stock_after_n_days.close.sub(stock.close) / stock.close; + let rate_of_change = rate_of_change.mul(100.0); + let pattern_rate_of_change_pair = CrossoverPatternRateOfChangePair { + crossover_pattern: sma_cos.crossover_pattern_close.0, + rate_of_change, + }; + let analysis_pattern = AnalysisPattern::from(pattern_rate_of_change_pair); + Some(AnalysisResult { + date_of_event: sma_cos.date, + close: stock.close, + close_after_n_days: stock_after_n_days.close, + pattern: sma_cos.crossover_pattern_close.0, + rate_of_change, + analysis_pattern, + }) + }) + .collect(); + AnalysisResults::(vec_analysis_result) + } +} + +impl AnalysisResults { + pub fn rate_of_chance(&self) -> RateOfChance { + let count_golden_chance = self + .par_iter() + .filter(|analysis_result| { + matches!( + analysis_result.analysis_pattern, + AnalysisPattern::GoldenChance + ) + }) + .count(); + let count_golden_loss = self + .par_iter() + .filter(|analysis_result| { + matches!( + analysis_result.analysis_pattern, + AnalysisPattern::GoldenLoss + ) + }) + .count(); + let golden = percentage(count_golden_chance, count_golden_chance + count_golden_loss); + + let count_dead_chance = self + .par_iter() + .filter(|analysis_result| { + matches!( + analysis_result.analysis_pattern, + AnalysisPattern::DeadChance + ) + }) + .count(); + let count_dead_loss = self + .par_iter() + .filter(|analysis_result| { + matches!(analysis_result.analysis_pattern, AnalysisPattern::DeadLoss) + }) + .count(); + let dead = percentage(count_dead_chance, count_dead_chance + count_dead_loss); + + let whole = percentage(count_golden_chance + count_dead_chance, self.len()); + RateOfChance { + whole, + golden, + dead, + } + } + + fn find_latest_event(&self, target_pattern: &AnalysisPattern) -> Option { + self.par_iter() + .find_last(|analysis_result| analysis_result.analysis_pattern.eq(target_pattern)) + .map(|analysis_result| analysis_result.date_of_event) + } + + pub fn latest_chance(&self) -> LatestChance { + let golden_cross = self.find_latest_event(&AnalysisPattern::GoldenChance); + let dead_cross = self.find_latest_event(&AnalysisPattern::DeadChance); + LatestChance { + golden_cross, + dead_cross, + } + } +} + +#[cfg(test)] +mod tests { + use crate::domain::models::crossover_strategy::sma_cos::analysis_result::close::model::AnalysisResults; + use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; + use crate::domain::models::sma::model::{SMAListPair, SMAs}; + use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; + use crate::domain::repositories::stock::queries; + use crate::domain::repositories::stock::repository::Stock; + use crate::infrastructure::dsv::Dsv; + use crate::infrastructure::repositories::stock::structures::internal::csv; + use anyhow::Result; + use bytes::Bytes; + use chrono::NaiveDate; + use pretty_assertions::assert_eq; + + const CSV: &[u8] = include_bytes!("../../../../../../../assets/8473.T.csv"); + + #[tokio::test] + async fn sma_cos_analysis_close_test() -> Result<()> { + let dsv = Dsv::::new(true, Bytes::from(CSV)); + let query = queries::get_stocks::Query { + ..Default::default() + }; + let stocks = dsv.get_stocks(&query).await?; + let smas_5 = SMAs::<5>::from(stocks.as_slice()); + let smas_25 = SMAs::<25>::from(stocks.as_slice()); + let sma_list_pair = SMAListPair { + smas_n: smas_5.as_slice(), + smas_o: smas_25.as_slice(), + }; + let sma_coses = SmaCoses::from(sma_list_pair); + let stocks_sma_coses_pair = StocksSmaCosesPair { + stocks: stocks.as_slice(), + sma_coses: sma_coses.as_slice(), + }; + // 3日後トレンドを取得 + let analysis_results = AnalysisResults::<3>::from(&stocks_sma_coses_pair); + let actual = 11; + assert_eq!(actual, analysis_results.len()); + + let rate_of_chance = analysis_results.rate_of_chance(); + let actual = 45.45454545454545; + assert_eq!(actual, rate_of_chance.whole); + let actual = 66.66666666666666; + assert_eq!(actual, rate_of_chance.golden); + let actual = 20.0; + assert_eq!(actual, rate_of_chance.dead); + + let latest_chance = analysis_results.latest_chance(); + let actual = NaiveDate::from_ymd_opt(2023, 8, 30); + assert_eq!(actual, latest_chance.golden_cross); + let actual = NaiveDate::from_ymd_opt(2023, 3, 14); + assert_eq!(actual, latest_chance.dead_cross); + Ok(()) + } +} diff --git a/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume.rs b/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume.rs new file mode 100644 index 0000000..d9a5251 --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume.rs @@ -0,0 +1 @@ +pub(crate) mod model; diff --git a/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume/model.rs b/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume/model.rs new file mode 100644 index 0000000..863e318 --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos/analysis_result/volume/model.rs @@ -0,0 +1,86 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern::Neither; +use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; +use chrono::NaiveDate; +use deref_derive::{Deref, DerefMut}; +use rayon::iter::{IntoParallelRefIterator, ParallelIterator}; + +/// 出来高ベースの解析結果 +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct AnalysisResult { + /// Crossover発生日 + pub date_of_event: NaiveDate, + /// Crossover発生日の出来高 + pub volume: u64, + /// CrossoverPattern + pub pattern: CrossoverPattern, +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] +pub struct AnalysisResults(Vec); + +impl<'a> From<&StocksSmaCosesPair<'a>> for AnalysisResults { + fn from(value: &StocksSmaCosesPair<'a>) -> Self { + let StocksSmaCosesPair { stocks, sma_coses } = value; + let vec_sma_cos_analysis_volume = sma_coses + .par_iter() + .filter_map(|sma_cos| { + // Neitherは判断材料とならないため結果から除外する + if sma_cos.crossover_pattern_volume.0.eq(&Neither) { + return None; + } + // Crossover発生日と同じ日の株価情報を取得 + let stock = stocks + .par_iter() + .find_first(|stock| stock.date.eq(&sma_cos.date))?; + Some(AnalysisResult { + date_of_event: stock.date, + volume: stock.volume, + pattern: sma_cos.crossover_pattern_volume.0, + }) + }) + .collect::>(); + AnalysisResults(vec_sma_cos_analysis_volume) + } +} + +#[cfg(test)] +mod tests { + use crate::domain::models::crossover_strategy::sma_cos::analysis_result::volume::model::AnalysisResults; + use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; + use crate::domain::models::sma::model::{SMAListPair, SMAs}; + use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; + use crate::domain::repositories::stock::queries; + use crate::domain::repositories::stock::repository::Stock; + use crate::infrastructure::dsv::Dsv; + use crate::infrastructure::repositories::stock::structures::internal::csv; + use anyhow::Result; + use bytes::Bytes; + use pretty_assertions::assert_eq; + + const CSV: &[u8] = include_bytes!("../../../../../../../assets/8473.T.csv"); + + #[tokio::test] + async fn sma_cos_analysis_volume_test() -> Result<()> { + let dsv = Dsv::::new(true, Bytes::from(CSV)); + let query = queries::get_stocks::Query { + ..Default::default() + }; + let stocks = dsv.get_stocks(&query).await?; + let smas_5 = SMAs::<5>::from(stocks.as_slice()); + let smas_25 = SMAs::<25>::from(stocks.as_slice()); + let sma_list_pair = SMAListPair { + smas_n: smas_5.as_slice(), + smas_o: smas_25.as_slice(), + }; + let sma_coses = SmaCoses::from(sma_list_pair); + let stocks_sma_coses_pair = StocksSmaCosesPair { + stocks: stocks.as_slice(), + sma_coses: sma_coses.as_slice(), + }; + let sma_cos_analysis_volumes = AnalysisResults::from(&stocks_sma_coses_pair); + let actual = 33; + assert_eq!(actual, sma_cos_analysis_volumes.len()); + Ok(()) + } +} diff --git a/src/domain/models/crossover_strategy/sma_cos/model.rs b/src/domain/models/crossover_strategy/sma_cos/model.rs new file mode 100644 index 0000000..7140ded --- /dev/null +++ b/src/domain/models/crossover_strategy/sma_cos/model.rs @@ -0,0 +1,161 @@ +use crate::domain::models::crossover_strategy::crossover_pattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::sma::model::{SMAListPair, SMAPair}; +use crate::domain::models::{close, volume}; +use chrono::NaiveDate; +use deref_derive::{Deref, DerefMut}; +use rayon::prelude::*; +use std::cmp::Ordering; + +/// SimpleMovingAverageCrossoverStrategy +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct SmaCos { + pub date: NaiveDate, + pub close_25: Option, + pub volume_25: Option, + pub crossover_pattern_close: crossover_pattern::close::model::CrossoverPattern, + pub crossover_pattern_volume: crossover_pattern::volume::model::CrossoverPattern, +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] +pub struct SmaCoses(Vec); + +impl<'a> From> for SmaCoses { + /// + /// # Examples + /// ``` + /// use bytes::Bytes; + /// use rayon::prelude::*; + /// + /// use quantitative_data_analysis_rs::domain::models::sma::model::{SMAListPair, SMAs}; + /// use quantitative_data_analysis_rs::domain::models::stock::model; + /// use quantitative_data_analysis_rs::domain::models::crossover_strategy::sma_cos::model::SmaCoses; + /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; + /// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; + /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; + /// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; + /// + /// const CSV: &[u8] = include_bytes!("../../../../../assets/8473.T.csv"); + /// + /// tokio_test::block_on(async { + /// let dsv = Dsv::::new(true, Bytes::from(CSV)); + /// let query = queries::get_stocks::Query { + /// ..Default::default() + /// }; + /// let stocks = dsv.get_stocks(&query).await.unwrap(); + /// let smas_5 = SMAs::<5>::from(stocks.as_slice()); + /// let smas_25 = SMAs::<25>::from(stocks.as_slice()); + /// let sma_list_pair = SMAListPair { + /// smas_n: smas_5.as_slice(), + /// smas_o: smas_25.as_slice(), + /// }; + /// let sma_coses = SmaCoses::from(sma_list_pair); + /// assert_eq!(sma_coses.len(), 241); + /// }); + /// ``` + fn from(value: SMAListPair<'a, 5, 25>) -> Self { + let SMAListPair { + smas_n: smas_5, + smas_o: smas_25, + } = value; + let vec_sma_cos = smas_5 + .par_iter() + .map(|sma_5| { + let sma_25 = smas_25 + .par_iter() + .find_first(|sma_25| sma_25.date.eq(&sma_5.date)); + let sma_pair = SMAPair { + sma_n: sma_5, + sma_o: sma_25, + }; + let ordering_close_volume = OrderingCloseVolume::from(sma_pair); + let (close, volume) = match sma_25 { + Some(sma_25) => (Some(sma_25.close), Some(sma_25.volume)), + None => (None, None), + }; + (sma_5.date, close, volume, ordering_close_volume) + }) + .collect::, + Option, + OrderingCloseVolume, + )>>() + .par_windows(2) + .map(|windows| { + let &(_, _, _, yesterday_ordering_close_volume) = &windows[0]; + let &(target, target_close, target_volume, target_ordering_close_volume) = + &windows[1]; + let ordering_close_volume_pair = OrderingCloseVolumePair { + past: yesterday_ordering_close_volume, + target: target_ordering_close_volume, + }; + let CrossoverPatternCloseVolume { + close: crossover_pattern_close, + volume: crossover_pattern_volume, + } = CrossoverPatternCloseVolume::from(ordering_close_volume_pair); + SmaCos { + date: target, + close_25: target_close, + volume_25: target_volume, + crossover_pattern_close: crossover_pattern::close::model::CrossoverPattern( + crossover_pattern_close, + ), + crossover_pattern_volume: crossover_pattern::volume::model::CrossoverPattern( + crossover_pattern_volume, + ), + } + }) + .collect::>(); + Self(vec_sma_cos) + } +} + +/// 終値ベース、出来高ベースそれぞれの大小関係 +/// 対象日が片方なかったなど比較出来なかった場合は、None +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +struct OrderingCloseVolume { + /// 終値ベースの比較値 + pub close: Option, + /// 取引高ベースの比較値 + pub volume: Option, +} + +impl<'a, const N: usize, const O: usize> From> for OrderingCloseVolume { + fn from(value: SMAPair<'a, N, O>) -> Self { + let SMAPair { sma_n, sma_o } = value; + match (sma_n, sma_o) { + (sma_n, Some(sma_o)) => { + let close = sma_n.close.0.partial_cmp(&sma_o.close.0); + let volume = sma_n.volume.0.partial_cmp(&sma_o.volume.0); + OrderingCloseVolume { close, volume } + } + (_, _) => OrderingCloseVolume::default(), + } + } +} + +struct OrderingCloseVolumePair { + pub past: OrderingCloseVolume, + pub target: OrderingCloseVolume, +} + +/// 終値・取引高における各移動平均線が交わったときの向きのパターンのセット +#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] +pub struct CrossoverPatternCloseVolume { + /// 終値ベースのMACOSのパターン + pub close: CrossoverPattern, + /// 出来高ベースのMACOSのパターン + pub volume: CrossoverPattern, +} + +impl From for CrossoverPatternCloseVolume { + fn from(value: OrderingCloseVolumePair) -> Self { + // 前日と対象日の大小関係を比較して、ゴールデンクロスかデッドクロスかどちらも発生していないかを判定していく。 + // https://myfrankblog.com/find_golden_cross_and_dead_cross_by_python/#i-4 + let OrderingCloseVolumePair { past, target } = value; + let close = CrossoverPattern::from((past.close, target.close)); + let volume = CrossoverPattern::from((past.volume, target.volume)); + CrossoverPatternCloseVolume { close, volume } + } +} diff --git a/src/domain/models/stocks_macoses_pair.rs b/src/domain/models/crossover_strategy/sma_cps.rs similarity index 100% rename from src/domain/models/stocks_macoses_pair.rs rename to src/domain/models/crossover_strategy/sma_cps.rs diff --git a/src/domain/models/macps/model.rs b/src/domain/models/crossover_strategy/sma_cps/model.rs similarity index 80% rename from src/domain/models/macps/model.rs rename to src/domain/models/crossover_strategy/sma_cps/model.rs index 76a6328..23375ac 100644 --- a/src/domain/models/macps/model.rs +++ b/src/domain/models/crossover_strategy/sma_cps/model.rs @@ -1,14 +1,13 @@ -use rayon::prelude::*; - use crate::domain::models::buy_sell_signal::model::{BuySellSignal, BuySellSignalType}; use crate::domain::models::sma::model::SMAListTrio; use crate::domain::models::stock::model::Stock; use chrono::NaiveDate; +use rayon::prelude::*; use std::cmp::Ordering; -/// MovingAverageComparisonStrategy +/// SimpleMovingAverageComparisonStrategy #[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACPS { +pub struct SmaCps { pub buy: Option, pub sell: Option, } @@ -17,11 +16,11 @@ impl From<(Option, Option, Option)> for BuySellSig fn from(value: (Option, Option, Option)) -> Self { let (cmp1, cmp2, cmp3) = value; match (cmp1, cmp2, cmp3) { - // current close < 5day sma < 25day sma < 50day sma → Buy + // current close < 5day SMA < 25day SMA < 50day SMA → Buy (Some(Ordering::Less), Some(Ordering::Less), Some(Ordering::Less)) => { BuySellSignalType::Buy } - // current close > 5day sma > 25day sma > 50day sma → Sell + // current close > 5day SMA > 25day SMA > 50day SMA → Sell (Some(Ordering::Greater), Some(Ordering::Greater), Some(Ordering::Greater)) => { BuySellSignalType::Sell } @@ -30,7 +29,7 @@ impl From<(Option, Option, Option)> for BuySellSig } } -impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for MACPS { +impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for SmaCps { /// /// # Examples /// ``` @@ -38,7 +37,7 @@ impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for MACPS { /// use chrono::NaiveDate; /// use rayon::prelude::*; /// - /// use quantitative_data_analysis_rs::domain::models::macps::model::MACPS; + /// use quantitative_data_analysis_rs::domain::models::crossover_strategy::sma_cps::model::SmaCps; /// use quantitative_data_analysis_rs::domain::models::sma::model::{SMAListTrio, SMAs}; /// use quantitative_data_analysis_rs::domain::models::stock::model; /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; @@ -46,7 +45,7 @@ impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for MACPS { /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; /// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; /// - /// const CSV: &[u8] = include_bytes!("../../../../assets/8473.T.csv"); + /// const CSV: &[u8] = include_bytes!("../../../../../assets/8473.T.csv"); /// /// tokio_test::block_on(async { /// let dsv = Dsv::::new(true, Bytes::from(CSV)); @@ -62,8 +61,8 @@ impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for MACPS { /// smas_o: smas_25.as_slice(), /// smas_p: smas_50.as_slice(), /// }; - /// let macps = MACPS::from((stocks.as_slice(), sma_list_trio)); - /// assert_eq!(macps, MACPS { buy: NaiveDate::from_ymd_opt(2023, 4, 10), sell: NaiveDate::from_ymd_opt(2023, 9, 8) }); + /// let sma_cps = SmaCps::from((stocks.as_slice(), sma_list_trio)); + /// assert_eq!(sma_cps, SmaCps { buy: NaiveDate::from_ymd_opt(2023, 4, 10), sell: NaiveDate::from_ymd_opt(2023, 9, 8) }); /// }); /// ``` fn from(value: (&[Stock], SMAListTrio<'a, 5, 25, 50>)) -> Self { @@ -82,9 +81,9 @@ impl<'a> From<(&[Stock], SMAListTrio<'a, 5, 25, 50>)> for MACPS { let sma_n = smas_n.par_iter().find_first(|sma_n| sma_n.date.eq(&date))?; let sma_o = smas_o.par_iter().find_first(|sma_o| sma_o.date.eq(&date))?; let sma_p = smas_p.par_iter().find_first(|sma_p| sma_p.date.eq(&date))?; - let cmp1 = stock.close.partial_cmp(&sma_n.sma_n.close); - let cmp2 = sma_n.sma_n.close.partial_cmp(&sma_o.sma_n.close); - let cmp3 = sma_o.sma_n.close.partial_cmp(&sma_p.sma_n.close); + let cmp1 = stock.close.partial_cmp(&sma_n.close.0); + let cmp2 = sma_n.close.0.partial_cmp(&sma_o.close.0); + let cmp3 = sma_o.close.0.partial_cmp(&sma_p.close.0); let r#type = BuySellSignalType::from((cmp1, cmp2, cmp3)); let r#type = r#type.ne(&BuySellSignalType::Stay).then_some(r#type)?; Some(BuySellSignal { date, r#type }) diff --git a/src/domain/models/high_low_direction_signal.rs b/src/domain/models/high_low_direction_signal.rs new file mode 100644 index 0000000..65880be --- /dev/null +++ b/src/domain/models/high_low_direction_signal.rs @@ -0,0 +1 @@ +pub mod model; diff --git a/src/domain/models/ecp1/model.rs b/src/domain/models/high_low_direction_signal/model.rs similarity index 84% rename from src/domain/models/ecp1/model.rs rename to src/domain/models/high_low_direction_signal/model.rs index 838228f..d13bc61 100644 --- a/src/domain/models/ecp1/model.rs +++ b/src/domain/models/high_low_direction_signal/model.rs @@ -1,26 +1,25 @@ -use deref_derive::{Deref, DerefMut}; -use itertools::Itertools; -use std::cmp::Ordering; - use crate::domain::models::buy_sell_signal::model::{BuySellSignal, BuySellSignalType}; use crate::domain::models::stock::model::Stock; +use deref_derive::{Deref, DerefMut}; +use rayon::prelude::*; +use std::cmp::Ordering; #[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)] -pub struct ECP1 { +pub struct HighLowDirectionSignal { low_ordering: Option, high_ordering: Option, } -/// Engulfing Candlestick Pattern1 +/// High Low Direction Signal /// -/// ある日とその前日の安値・高値の切り上がり・切り下がりをみる +/// ある日とその前日の安値・高値の切り上がり・切り下がりをみて、価格レンジのトレンド方向のシグナルを出す /// /// * **Buy**: 安値切り上がりかつ高値切り上がり /// * **Sell**: 安値切り下がりかつ高値切り下がり /// * **Stay**: 上記のどちらにもあてはまならない -impl From for BuySellSignalType { - fn from(value: ECP1) -> Self { - let ECP1 { +impl From for BuySellSignalType { + fn from(value: HighLowDirectionSignal) -> Self { + let HighLowDirectionSignal { low_ordering, high_ordering, } = value; @@ -33,15 +32,15 @@ impl From for BuySellSignalType { } #[derive(Default, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Deref, DerefMut)] -pub struct ECP1s(Vec); +pub struct HighLowDirectionSignals(Vec); -impl From<&[Stock]> for ECP1s { +impl From<&[Stock]> for HighLowDirectionSignals { /// /// # Examples /// ``` /// use bytes::Bytes; /// - /// use quantitative_data_analysis_rs::domain::models::ecp1::model::ECP1s; + /// use quantitative_data_analysis_rs::domain::models::high_low_direction_signal::model::HighLowDirectionSignals; /// use quantitative_data_analysis_rs::domain::models::stock::model; /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; /// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; @@ -56,13 +55,13 @@ impl From<&[Stock]> for ECP1s { /// ..Default::default() /// }; /// let stocks = dsv.get_stocks(&query).await.unwrap(); - /// let ecp1s = ECP1s::from(stocks.as_slice()); - /// assert_eq!(ecp1s.len(), 34); + /// let high_low_direction_signals = HighLowDirectionSignals::from(stocks.as_slice()); + /// assert_eq!(high_low_direction_signals.len(), 34); /// }); /// ``` fn from(value: &[Stock]) -> Self { - let vec_buy_sell_signal = value - .windows(2) + let vec_high_low_direction_signal = value + .par_windows(2) .map(|stock| { let prev = stock.first().unwrap(); let today = stock.get(1).unwrap(); @@ -70,17 +69,17 @@ impl From<&[Stock]> for ECP1s { let low_ordering = today.low.partial_cmp(&prev.low); // 前日・当日それぞれの高値を比較する let high_ordering = today.high.partial_cmp(&prev.high); - let ecp1 = ECP1 { + let high_low_direction_signal = HighLowDirectionSignal { low_ordering, high_ordering, }; // 高値・安値の切り上げ・切り下げを基にした売買シグナル - let r#type = BuySellSignalType::from(ecp1); + let r#type = BuySellSignalType::from(high_low_direction_signal); let date = today.date; BuySellSignal { r#type, date } }) - .collect_vec(); - ECP1s(vec_buy_sell_signal) + .collect(); + HighLowDirectionSignals(vec_high_low_direction_signal) } } @@ -96,7 +95,7 @@ mod tests { BuySellSignal, BuySellSignalType::{Buy, Sell}, }; - use crate::domain::models::ecp1::model::ECP1s; + use crate::domain::models::high_low_direction_signal::model::HighLowDirectionSignals; use crate::domain::repositories::stock::queries; use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::dsv::Dsv; @@ -111,9 +110,9 @@ mod tests { ..Default::default() }; let stocks = dsv.get_stocks(&query).await?; - let ecp1s = ECP1s::from(stocks.as_slice()); + let high_low_direction_signals = HighLowDirectionSignals::from(stocks.as_slice()); let (actual_buy, actual_sell): (Vec<_>, Vec<_>) = - TupleVecBuySellSignal::from(ecp1s.as_slice()).0; + TupleVecBuySellSignal::from(high_low_direction_signals.as_slice()).0; let (expected_buy, expected_sell): (Vec, Vec) = ( vec![ BuySellSignal { diff --git a/src/domain/models/macd.rs b/src/domain/models/macd.rs new file mode 100644 index 0000000..65880be --- /dev/null +++ b/src/domain/models/macd.rs @@ -0,0 +1 @@ +pub mod model; diff --git a/src/domain/models/macd/model.rs b/src/domain/models/macd/model.rs new file mode 100644 index 0000000..39c8f4e --- /dev/null +++ b/src/domain/models/macd/model.rs @@ -0,0 +1,69 @@ +use crate::domain::models::stock::model::Stock; +use chrono::NaiveDate; +use deref_derive::{Deref, DerefMut}; +use ta::Next; +use ta::indicators::MovingAverageConvergenceDivergence; + +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct MACD { + pub date: NaiveDate, + pub macd: f64, + pub signal: f64, + pub histogram: f64, +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] +pub struct MACDs(Vec); + +/// # Examples +/// ``` +/// use bytes::Bytes; +/// use quantitative_data_analysis_rs::domain::models::macd::model::MACDs; +/// use quantitative_data_analysis_rs::domain::models::stock::model; +/// use quantitative_data_analysis_rs::domain::repositories::stock::queries; +/// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; +/// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; +/// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; +/// +/// const FAST_PERIOD: usize = 12; +/// const SLOW_PERIOD: usize = 26; +/// const SIGNAL_PERIOD: usize = 9; +/// const CSV: &[u8] = include_bytes!("../../../../assets/9223.T.csv"); +/// +/// tokio_test::block_on(async { +/// let dsv = Dsv::::new(true, Bytes::from(CSV)); +/// let query = queries::get_stocks::Query { +/// ..Default::default() +/// }; +/// let stocks = dsv.get_stocks(&query).await.unwrap(); +/// let macds = MACDs::::from(stocks.as_slice()); +/// assert_eq!(macds.len(), 35); +/// }); +/// ``` +impl From<&[Stock]> for MACDs { + fn from(value: &[Stock]) -> Self { + const { + assert!(F > 0, "F(fast period) is greater than 0"); + } + const { + assert!(S > 0, "S(slow period) is greater than 0"); + } + const { + assert!(SG > 0, "SG(signal period) is greater than 0"); + } + let mut macd = MovingAverageConvergenceDivergence::new(F, S, SG).unwrap(); + let macds = value + .iter() + .map(|stock| { + let (macd, signal, histogram) = macd.next(stock.close).into(); + MACD { + date: stock.date, + macd, + signal, + histogram, + } + }) + .collect::>(); + MACDs(macds) + } +} diff --git a/src/domain/models/macos/model.rs b/src/domain/models/macos/model.rs deleted file mode 100644 index 7fe4a97..0000000 --- a/src/domain/models/macos/model.rs +++ /dev/null @@ -1,294 +0,0 @@ -use crate::domain::models::sma::model::{SMAListPair, SMAPair, SMASet}; -use chrono::NaiveDate; -use deref_derive::{Deref, DerefMut}; -use rayon::prelude::*; -use serde::{Deserialize, Serialize}; -use std::cmp::Ordering; -use strum::Display; - -/// MovingAverageCrossoverStrategy -#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACOS { - pub date: NaiveDate, - pub sma_set_25: Option>, - pub pattern_close_volume: PatternCloseVolume, -} - -/// 終値・取引高における各移動平均線が交わったときの向きのパターンのセット -#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] -pub struct PatternCloseVolume { - /// 終値ベースのMACOSのパターン - pub close: Pattern, - /// 出来高ベースのMACOSのパターン - pub volume: Pattern, -} - -/// 各移動平均線が交わったときの向きのパターン -#[derive( - Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Display, -)] -pub enum Pattern { - #[default] - Neither, - /// GoldenCross - GoldenCross, - /// DeadCross - DeadCross, -} - -/// Creates a `Pattern` from a tuple of two `Option` values. -/// -/// # Parameters -/// - `value: (Option, Option)` -/// A tuple containing two optional `Ordering` values, which represent comparisons. -/// -/// # Returns -/// - `Pattern`: -/// - Returns `Pattern::Golden` if the first value is `Some(Ordering::Less)` and the second is `Some(Ordering::Greater)`. -/// - Returns `Pattern::Dead` if the first value is `Some(Ordering::Greater)` and the second is `Some(Ordering::Less)`. -/// - Returns `Pattern::Neither` for all other cases. -/// -/// # Behavior -/// - The function pattern matches on the provided tuple of `Option` values to determine which `Pattern` variant to return. -/// -/// # Notes -/// - Provides a convenient way to map comparison results (`Ordering`) into a `Pattern` variant. -impl From<(Option, Option)> for Pattern { - fn from(value: (Option, Option)) -> Self { - match value { - (Some(Ordering::Less), Some(Ordering::Greater)) => Self::GoldenCross, - (Some(Ordering::Greater), Some(Ordering::Less)) => Self::DeadCross, - _ => Self::Neither, - } - } -} - -/// MACOS trend_analysis_summary pattern -#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] -pub enum AnalysisPattern { - #[default] - None, - GoldenChance, - DeadChance, - GoldenLoss, - DeadLoss, -} - -/// A pair of `Pattern` and `rate_of_change` values. -pub(crate) struct PatternRateOfChangePair { - pub pattern: Pattern, - pub rate_of_change: f64, -} - -/// Converts a `PatternRateOfChangePair` into an `AnalysisPattern`. -/// -/// # Parameters -/// - `value: PatternRateOfChangePair` -/// The input object containing a `Pattern` (either `Golden` or `Dead`) and a `rate_of_change` value for evaluation. -/// -/// # Returns -/// - `AnalysisPattern`: -/// - Returns `AnalysisPattern::GoldenChance` if the `Pattern` is `Golden` and the `rate_of_change` is greater than `0.0`. -/// - Returns `AnalysisPattern::DeadChance` if the `Pattern` is `Dead` and the `rate_of_change` is less than `0.0`. -/// - Returns `AnalysisPattern::GoldenLoss` if the `Pattern` is `Golden` and the `rate_of_change` is less than or equal to `0.0`. -/// - Returns `AnalysisPattern::DeadLoss` if the `Pattern` is `Dead` and the `rate_of_change` is greater than or equal to `0.0`. -/// - Returns `AnalysisPattern::None` if none of the above conditions are met. -/// -/// # Behavior -/// - The conversion logic evaluates both the `Pattern` and the `rate_of_change` value -/// based on specific conditions to determine the appropriate `AnalysisPattern` variant. -/// -/// # Notes -/// - This implementation provides a structured way to classify input `PatternRateOfChangePair` values into `AnalysisPattern` variants, -/// reflecting specific conditions of the pattern and its associated rate of change. -impl From for AnalysisPattern { - fn from(value: PatternRateOfChangePair) -> Self { - match value { - // GoldenChance: GoldenPattern/rate_of_change > 0.0 - PatternRateOfChangePair { - pattern: Pattern::GoldenCross, - rate_of_change: change, - } if change > 0.0 => AnalysisPattern::GoldenChance, - // DeadChance: DeadPattern/rate_of_change < 0.0 - PatternRateOfChangePair { - pattern: Pattern::DeadCross, - rate_of_change: change, - } if change < 0.0 => AnalysisPattern::DeadChance, - // GoldenLoss: GoldenPattern/rate_of_change <= 0.0 - PatternRateOfChangePair { - pattern: Pattern::GoldenCross, - rate_of_change: change, - } if change <= 0.0 => AnalysisPattern::GoldenLoss, - // DeadLoss: DeadPattern/rate_of_change >= 0.0 - PatternRateOfChangePair { - pattern: Pattern::DeadCross, - rate_of_change: change, - } if change >= 0.0 => AnalysisPattern::DeadLoss, - _ => AnalysisPattern::None, - } - } -} - -#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] -pub struct MACOSes(Vec); - -impl MACOSes { - /// Retrieves the latest date based on the closing value that matches a specified pattern. - /// - /// # Parameters - /// - `pattern: &Pattern` - /// A reference to the `Pattern` object used to match against the `close` value - /// in the `pattern_close_volume` of each `MACOS` item. - /// - /// # Returns - /// - `Option`: - /// - Returns `Some(date)` if one or more `MACOS` objects match the given pattern, where `date` is the latest matching date. - /// - Returns `None` if no matches are found. - /// - /// # Process - /// - The method uses parallel iteration (`par_iter`) for efficiency when traversing the `MACOSES` collection. - /// - It filters `MACOS` objects where the `close` field of `pattern_close_volume` equals the given `Pattern`. - /// - The filtered results are then sorted by the `date` field in ascending order. - /// - Finally, the latest date (if any) is extracted and returned. - /// - /// # Notes - /// - This method leverages the `rayon` library for parallel processing, ideal for handling large datasets. - /// - Sorting is done using `itertools`'s `sorted_by` for a clear and concise sorting step. - pub fn latest_based_on_close(&self, pattern: &Pattern) -> Option { - self.par_iter() - .filter_map(|macos| { - if macos.pattern_close_volume.close.eq(pattern) { - Some(*macos) - } else { - None - } - }) - .max_by(|a, b| Ord::cmp(&a.date, &b.date)) - .map(|x| x.date) - } -} - -struct Intermediate { - date: NaiveDate, - sma_set_25: Option>, - ordering_close_volume_5_25: OrderingCloseVolume<5, 25>, -} - -impl<'a> From> for MACOSes { - /// - /// # Examples - /// ``` - /// use bytes::Bytes; - /// use rayon::prelude::*; - /// - /// use quantitative_data_analysis_rs::domain::models::sma::model::{SMAListPair, SMAs}; - /// use quantitative_data_analysis_rs::domain::models::macos::model::MACOSes; - /// use quantitative_data_analysis_rs::domain::models::stock::model; - /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; - /// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; - /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; - /// use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv; - /// - /// const CSV: &[u8] = include_bytes!("../../../../assets/8473.T.csv"); - /// - /// tokio_test::block_on(async { - /// let dsv = Dsv::::new(true, Bytes::from(CSV)); - /// let query = queries::get_stocks::Query { - /// ..Default::default() - /// }; - /// let stocks = dsv.get_stocks(&query).await.unwrap(); - /// let smas_5 = SMAs::<5>::from(stocks.as_slice()); - /// let smas_25 = SMAs::<25>::from(stocks.as_slice()); - /// let sma_list_pair = SMAListPair { - /// smas_n: smas_5.as_slice(), - /// smas_o: smas_25.as_slice(), - /// }; - /// let macoses = MACOSes::from(sma_list_pair); - /// assert_eq!(macoses.len(), 241); - /// }); - /// ``` - fn from(value: SMAListPair<'a, 5, 25>) -> Self { - let SMAListPair { - smas_n: smas_5, - smas_o: smas_25, - } = value; - let intermediates: Vec = smas_5 - .par_iter() - .map(|sma_5| { - let sma_25 = smas_25 - .par_iter() - .find_first(|sma_25| sma_5.date.eq(&sma_25.date)); - let sma_pair = SMAPair { - sma_n: sma_5, - sma_o: sma_25, - }; - let ordering_close_volume_5_25 = OrderingCloseVolume::from(sma_pair); - Intermediate { - date: sma_5.date, - sma_set_25: sma_25.map(|sma_25| sma_25.sma_n), - ordering_close_volume_5_25, - } - }) - .collect(); - let vec_macos = intermediates - .par_windows(2) - .map(|x| { - let yesterday = x[0].ordering_close_volume_5_25; - let today = x[1].ordering_close_volume_5_25; - let ordering_close_volume_pair = OrderingCloseVolumePastFuture { - past: yesterday, - future: today, - }; - let pattern_close_volume = PatternCloseVolume::from(ordering_close_volume_pair); - MACOS { - date: x[1].date, - sma_set_25: x[1].sma_set_25, - pattern_close_volume, - } - }) - .collect::>(); - Self(vec_macos) - } -} - -/// 終値ベース、出来高ベースそれぞれの大小関係 -/// 対象日が片方なかったなど比較出来なかった場合は、None -#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] -pub struct OrderingCloseVolume { - /// 終値ベースの比較値 - pub close: Option, - /// 取引高ベースの比較値 - pub volume: Option, -} - -impl<'a, const N: usize, const O: usize> From> for OrderingCloseVolume { - fn from(value: SMAPair<'a, N, O>) -> Self { - let SMAPair { sma_n, sma_o } = value; - match (sma_n, sma_o) { - (sma_n, Some(sma_o)) => { - let close = sma_n.sma_n.close.partial_cmp(&sma_o.sma_n.close); - let volume = sma_n.sma_n.volume.partial_cmp(&sma_o.sma_n.volume); - OrderingCloseVolume:: { close, volume } - } - (_, _) => OrderingCloseVolume::::default(), - } - } -} - -struct OrderingCloseVolumePastFuture { - past: OrderingCloseVolume, - future: OrderingCloseVolume, -} - -impl From> - for PatternCloseVolume -{ - fn from(value: OrderingCloseVolumePastFuture) -> Self { - // 前日と対象日の大小関係を比較して、ゴールデンクロスかデッドクロスかどちらも発生していないかを判定していく。 - // https://myfrankblog.com/find_golden_cross_and_dead_cross_by_python/#i-4 - let OrderingCloseVolumePastFuture { past, future } = value; - let close = Pattern::from((past.close, future.close)); - let volume = Pattern::from((past.volume, future.volume)); - PatternCloseVolume { close, volume } - } -} diff --git a/src/domain/models/macos_analysis/close/model.rs b/src/domain/models/macos_analysis/close/model.rs deleted file mode 100644 index 0d3ecb8..0000000 --- a/src/domain/models/macos_analysis/close/model.rs +++ /dev/null @@ -1,259 +0,0 @@ -use crate::domain::models::macos::model::Pattern::{DeadCross, GoldenCross, Neither}; -use crate::domain::models::macos::model::{AnalysisPattern, Pattern, PatternRateOfChangePair}; -use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; -use crate::shared::float::percentage; - -use chrono::NaiveDate; -use deref_derive::{Deref, DerefMut}; -use rayon::prelude::*; -use std::ops::{Mul, Sub}; - -/// 終値ベースのMovingAverageCrossoverStrategyの解析 -#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACOSAnalysisClose { - /// Crossover発生日 - pub date_of_event: NaiveDate, - /// Crossover発生日の終値 - pub close: f64, - /// N日後の終値 - pub close_after_n_days: f64, - /// MovingAverageCrossoverStrategyPattern - pub pattern: Pattern, - /// 増減率 - pub rate_of_change: f64, - /// 分析パターン - pub analysis_pattern: AnalysisPattern, -} - -#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] -pub struct MACOSAnalysisCloses(Vec); - -impl<'a, const N: usize> From<&StocksMACOSESPair<'a>> for MACOSAnalysisCloses { - fn from(value: &StocksMACOSESPair<'a>) -> Self { - let StocksMACOSESPair { stocks, macoses } = value; - let vec_macos_analysis_close: Vec = macoses - .par_iter() - .filter_map(|macos| { - if macos.pattern_close_volume.close.eq(&Neither) { - return None; - } - // Crossoverが発生した日を特定 - let (stock, macos) = stocks.par_iter().find_map_first(|stock| { - if stock.date.eq(&macos.date) { - Some((stock, macos)) - } else { - None - } - })?; - // n日後のStockを取得。ただし営業日で並んでいる。 - let (stock, macos, stock_after_n_days) = stocks - .par_iter() - .enumerate() - .find_first(|(_, stock)| stock.date.eq(&macos.date)) - .and_then(|(index, _)| { - let stock_after_n_days = stocks.get(index + N)?; - Some((stock, macos, stock_after_n_days)) - })?; - // 増減率を取得 - let rate_of_change = stock_after_n_days.close.sub(stock.close) / stock.close; - let rate_of_change = rate_of_change.mul(100.0); - let pattern_rate_of_change_pair = PatternRateOfChangePair { - pattern: macos.pattern_close_volume.close, - rate_of_change, - }; - let analysis_pattern = AnalysisPattern::from(pattern_rate_of_change_pair); - Some(MACOSAnalysisClose { - date_of_event: macos.date, - close: stock.close, - close_after_n_days: stock_after_n_days.close, - pattern: macos.pattern_close_volume.close, - rate_of_change, - analysis_pattern, - }) - }) - .collect(); - MACOSAnalysisCloses::(vec_macos_analysis_close) - } -} - -#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct RateOfChance { - pub whole: f64, - pub golden: f64, - pub dead: f64, -} - -#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] -pub struct LatestChance { - pub golden_cross: Option, - pub dead_cross: Option, -} - -impl From for Pattern { - fn from(value: LatestChance) -> Self { - let LatestChance { - golden_cross: latest_golden_chance, - dead_cross: latest_dead_chance, - } = value; - match (latest_golden_chance, latest_dead_chance) { - (Some(golden), Some(dead)) => { - if golden >= dead { - GoldenCross - } else { - DeadCross - } - } - (Some(_), None) => GoldenCross, - (None, Some(_)) => DeadCross, - _ => Neither, - } - } -} - -impl From for NaiveDate { - fn from(value: LatestChance) -> Self { - let LatestChance { - golden_cross: latest_golden_chance, - dead_cross: latest_dead_chance, - } = value; - match (latest_golden_chance, latest_dead_chance) { - (Some(golden), Some(dead)) => { - if golden >= dead { - golden - } else { - dead - } - } - (Some(golden), None) => golden, - (None, Some(dead)) => dead, - _ => NaiveDate::default(), - } - } -} - -impl MACOSAnalysisCloses { - pub fn rate_of_chance(&self) -> RateOfChance { - let count_golden_chance = self - .par_iter() - .filter(|macos_analysis_close| { - matches!( - macos_analysis_close.analysis_pattern, - AnalysisPattern::GoldenChance - ) - }) - .count(); - let count_golden_loss = self - .par_iter() - .filter(|macos_analysis_close| { - matches!( - macos_analysis_close.analysis_pattern, - AnalysisPattern::GoldenLoss - ) - }) - .count(); - let golden = percentage(count_golden_chance, count_golden_chance + count_golden_loss); - - let count_dead_chance = self - .par_iter() - .filter(|macos_analysis_close| { - matches!( - macos_analysis_close.analysis_pattern, - AnalysisPattern::DeadChance - ) - }) - .count(); - let count_dead_loss = self - .par_iter() - .filter(|macos_analysis_close| { - matches!( - macos_analysis_close.analysis_pattern, - AnalysisPattern::DeadLoss - ) - }) - .count(); - let dead = percentage(count_dead_chance, count_dead_chance + count_dead_loss); - - let whole = percentage(count_golden_chance + count_dead_chance, self.len()); - RateOfChance { - whole, - golden, - dead, - } - } - - fn find_latest_event(&self, target_pattern: &AnalysisPattern) -> Option { - self.par_iter() - .rev() - .find_first(|macos_analysis_close| { - macos_analysis_close.analysis_pattern.eq(target_pattern) - }) - .map(|macos_analysis_close| macos_analysis_close.date_of_event) - } - - pub fn latest_chance(&self) -> LatestChance { - let golden_cross = self.find_latest_event(&AnalysisPattern::GoldenChance); - let dead_cross = self.find_latest_event(&AnalysisPattern::DeadChance); - LatestChance { - golden_cross, - dead_cross, - } - } -} - -#[cfg(test)] -mod tests { - use anyhow::Result; - use bytes::Bytes; - use chrono::NaiveDate; - use pretty_assertions::assert_eq; - - use crate::domain::models::macos::model::MACOSes; - use crate::domain::models::macos_analysis::close::model::MACOSAnalysisCloses; - use crate::domain::models::sma::model::{SMAListPair, SMAs}; - use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; - use crate::domain::repositories::stock::queries; - use crate::domain::repositories::stock::repository::Stock; - use crate::infrastructure::dsv::Dsv; - use crate::infrastructure::repositories::stock::structures::internal::csv; - - const CSV: &[u8] = include_bytes!("../../../../../assets/8473.T.csv"); - - #[tokio::test] - async fn macos_analysis_close_test() -> Result<()> { - let dsv = Dsv::::new(true, Bytes::from(CSV)); - let query = queries::get_stocks::Query { - ..Default::default() - }; - let stocks = dsv.get_stocks(&query).await?; - let smas_5 = SMAs::<5>::from(stocks.as_slice()); - let smas_25 = SMAs::<25>::from(stocks.as_slice()); - let sma_list_pair = SMAListPair { - smas_n: smas_5.as_slice(), - smas_o: smas_25.as_slice(), - }; - let macoses = MACOSes::from(sma_list_pair); - let stocks_macoses_pair = StocksMACOSESPair { - stocks: stocks.as_slice(), - macoses: macoses.as_slice(), - }; - // 3日後トレンドを取得 - let macos_analysis_closes = MACOSAnalysisCloses::<3>::from(&stocks_macoses_pair); - let actual = 11; - assert_eq!(actual, macos_analysis_closes.len()); - - let rate_of_chance = macos_analysis_closes.rate_of_chance(); - let actual = 45.45454545454545; - assert_eq!(actual, rate_of_chance.whole); - let actual = 66.66666666666666; - assert_eq!(actual, rate_of_chance.golden); - let actual = 20.0; - assert_eq!(actual, rate_of_chance.dead); - - let latest_chance = macos_analysis_closes.latest_chance(); - let actual = NaiveDate::from_ymd_opt(2023, 8, 30); - assert_eq!(actual, latest_chance.golden_cross); - let actual = NaiveDate::from_ymd_opt(2023, 3, 14); - assert_eq!(actual, latest_chance.dead_cross); - Ok(()) - } -} diff --git a/src/domain/models/macos_analysis/volume/model.rs b/src/domain/models/macos_analysis/volume/model.rs deleted file mode 100644 index 034e169..0000000 --- a/src/domain/models/macos_analysis/volume/model.rs +++ /dev/null @@ -1,87 +0,0 @@ -use crate::domain::models::macos::model::Pattern; -use crate::domain::models::macos::model::Pattern::Neither; -use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; -use chrono::NaiveDate; -use deref_derive::{Deref, DerefMut}; -use rayon::prelude::*; - -/// 出来高ベースのMovingAverageCrossoverStrategyのトレンド解析 -#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACOSAnalysisVolume { - /// Crossover発生日 - pub date_of_event: NaiveDate, - /// Crossover発生日の出来高 - pub volume: u64, - /// MovingAverageCrossoverStrategyPattern - pub pattern: Pattern, -} - -#[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] -pub struct MACOSAnalysisVolumes(Vec); - -impl<'a> From<&StocksMACOSESPair<'a>> for MACOSAnalysisVolumes { - fn from(value: &StocksMACOSESPair<'a>) -> Self { - let StocksMACOSESPair { stocks, macoses } = value; - let vec_macos_analysis_volume = macoses - .par_iter() - .filter_map(|macos| { - // Neitherは判断材料とならないため結果から除外する - if macos.pattern_close_volume.volume.eq(&Neither) { - return None; - } - // Crossover発生日と同じ日の株価情報を取得 - let stock = stocks - .par_iter() - .find_first(|stock| stock.date.eq(&macos.date))?; - Some(MACOSAnalysisVolume { - date_of_event: stock.date, - volume: stock.volume, - pattern: macos.pattern_close_volume.volume, - }) - }) - .collect::>(); - MACOSAnalysisVolumes(vec_macos_analysis_volume) - } -} - -#[cfg(test)] -mod tests { - use anyhow::Result; - use bytes::Bytes; - use pretty_assertions::assert_eq; - - use crate::domain::models::macos::model::MACOSes; - use crate::domain::models::macos_analysis::volume::model::MACOSAnalysisVolumes; - use crate::domain::models::sma::model::{SMAListPair, SMAs}; - use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; - use crate::domain::repositories::stock::queries; - use crate::domain::repositories::stock::repository::Stock; - use crate::infrastructure::dsv::Dsv; - use crate::infrastructure::repositories::stock::structures::internal::csv; - - const CSV: &[u8] = include_bytes!("../../../../../assets/8473.T.csv"); - - #[tokio::test] - async fn macos_analysis_volume_test() -> Result<()> { - let dsv = Dsv::::new(true, Bytes::from(CSV)); - let query = queries::get_stocks::Query { - ..Default::default() - }; - let stocks = dsv.get_stocks(&query).await?; - let smas_5 = SMAs::<5>::from(stocks.as_slice()); - let smas_25 = SMAs::<25>::from(stocks.as_slice()); - let sma_list_pair = SMAListPair { - smas_n: smas_5.as_slice(), - smas_o: smas_25.as_slice(), - }; - let macoses = MACOSes::from(sma_list_pair); - let stocks_macoses_pair = StocksMACOSESPair { - stocks: stocks.as_slice(), - macoses: macoses.as_slice(), - }; - let macos_analysis_volumes = MACOSAnalysisVolumes::from(&stocks_macoses_pair); - let actual = 33; - assert_eq!(actual, macos_analysis_volumes.len()); - Ok(()) - } -} diff --git a/src/domain/models/ms_es.rs b/src/domain/models/ms_es.rs new file mode 100644 index 0000000..65880be --- /dev/null +++ b/src/domain/models/ms_es.rs @@ -0,0 +1 @@ +pub mod model; diff --git a/src/domain/models/msesp/model.rs b/src/domain/models/ms_es/model.rs similarity index 89% rename from src/domain/models/msesp/model.rs rename to src/domain/models/ms_es/model.rs index 0482f00..61ef51b 100644 --- a/src/domain/models/msesp/model.rs +++ b/src/domain/models/ms_es/model.rs @@ -1,25 +1,24 @@ -use deref_derive::{Deref, DerefMut}; -use rayon::prelude::*; - use crate::domain::models::buy_sell_signal::model::{BuySellSignal, BuySellSignalType}; use crate::domain::models::candle_stick::model::{BullishBearishType, CandleStick}; +use deref_derive::{Deref, DerefMut}; +use rayon::prelude::*; #[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)] -pub struct MSESP { +pub struct MsEs { two_days_before_bullish_bearish: BullishBearishType, a_day_before_is_doji: bool, target_day_bullish_bearish: BullishBearishType, } -impl From for BuySellSignalType { - /// Morning Star/Evening Star Pattern +impl From for BuySellSignalType { + /// Morning Star/Evening Star /// /// 3つのローソク足を考える。 /// * **Buy**: 対象日の2日前がBearish、対象日の1日前が同事、対象日がBullishのとき /// * **Sell**: 対象日の2日前がBullish、対象日の1日前が同事、対象日がBearishのとき /// * **Stay**: 上記のどちらにもあてはまならない - fn from(value: MSESP) -> Self { - let MSESP { + fn from(value: MsEs) -> Self { + let MsEs { two_days_before_bullish_bearish, a_day_before_is_doji, target_day_bullish_bearish, @@ -37,9 +36,9 @@ impl From for BuySellSignalType { } #[derive(Default, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Deref, DerefMut)] -pub struct MSESPes(Vec); +pub struct MsEses(Vec); -impl From<&[CandleStick]> for MSESPes { +impl From<&[CandleStick]> for MsEses { /// /// # Examples /// ``` @@ -47,7 +46,7 @@ impl From<&[CandleStick]> for MSESPes { /// /// use quantitative_data_analysis_rs::domain::models::candle_stick::model::CandleSticks; /// use quantitative_data_analysis_rs::domain::models::stock::model; - /// use quantitative_data_analysis_rs::domain::models::msesp::model::MSESPes; + /// use quantitative_data_analysis_rs::domain::models::ms_es::model::MsEses; /// use quantitative_data_analysis_rs::domain::repositories::stock::queries; /// use quantitative_data_analysis_rs::domain::repositories::stock::repository::Stock; /// use quantitative_data_analysis_rs::infrastructure::dsv::Dsv; @@ -65,53 +64,52 @@ impl From<&[CandleStick]> for MSESPes { /// }; /// let stocks = dsv.get_stocks(&query).await.unwrap(); /// let candle_sticks = CandleSticks::::try_from(stocks.as_slice()).unwrap(); - /// let msespes = MSESPes::from(candle_sticks.as_slice()); - /// assert_eq!(msespes.len(), 33); + /// let mseses = MsEses::from(candle_sticks.as_slice()); + /// assert_eq!(mseses.len(), 33); /// }); /// ``` fn from(value: &[CandleStick]) -> Self { - let vec_buy_sell_signal = value + let vec_ms_es = value .par_windows(3) .map(|candle_sticks| { let two_days_before_bullish_bearish = candle_sticks[0].bullish_bearish; let a_day_before_is_doji = candle_sticks[1].is_doji; let target_day_bullish_bearish = candle_sticks[2].bullish_bearish; - let msesp = MSESP { + let ms_es = MsEs { two_days_before_bullish_bearish, a_day_before_is_doji, target_day_bullish_bearish, }; - let r#type = BuySellSignalType::from(msesp); + let r#type = BuySellSignalType::from(ms_es); let today = candle_sticks[2].date; BuySellSignal { r#type, date: today, } }) - .collect::>(); - MSESPes(vec_buy_sell_signal) + .collect(); + MsEses(vec_ms_es) } } #[cfg(test)] mod tests { - use anyhow::Result; - use bytes::Bytes; - use chrono::NaiveDate; - use pretty_assertions::assert_eq; - use rayon::prelude::*; - use crate::domain::models::buy_sell_signal::model::BuySellSignalType::Sell; use crate::domain::models::buy_sell_signal::model::{ BuySellSignal, BuySellSignalType::{Buy, Stay}, }; use crate::domain::models::candle_stick::model::CandleSticks; - use crate::domain::models::msesp::model::MSESPes; + use crate::domain::models::ms_es::model::MsEses; use crate::domain::repositories::stock::queries; use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::dsv::Dsv; use crate::infrastructure::repositories::stock::structures::internal::csv; + use anyhow::Result; + use bytes::Bytes; + use chrono::NaiveDate; + use pretty_assertions::assert_eq; + use rayon::prelude::*; const MARUBOZU_BODY_MIN_RATIO: usize = 90; const MARUBOZU_WICK_MAX_RATIO: usize = 2; @@ -130,8 +128,8 @@ mod tests { MARUBOZU_WICK_MAX_RATIO, DOJI_MAX_BODY_RATIO, >::try_from(stocks.as_slice())?; - let MSESPes(vec_msesp) = MSESPes::from(candle_sticks.as_slice()); - let (actual_buy, actual_sell): (Vec<_>, Vec<_>) = vec_msesp + let MsEses(vec_ms_es) = MsEses::from(candle_sticks.as_slice()); + let (actual_buy, actual_sell): (Vec<_>, Vec<_>) = vec_ms_es .into_par_iter() .filter(|signal| signal.r#type.ne(&Stay)) .partition(|signal| signal.r#type.eq(&Buy)); diff --git a/src/domain/models/sma/model.rs b/src/domain/models/sma/model.rs index f5056aa..f3f678e 100644 --- a/src/domain/models/sma/model.rs +++ b/src/domain/models/sma/model.rs @@ -1,47 +1,21 @@ +use crate::domain::models::close; use crate::domain::models::stock::model::Stock; - +use crate::domain::models::volume; use chrono::NaiveDate; use deref_derive::{Deref, DerefMut}; use rayon::prelude::*; -use simple_moving_average::{SMA as OtherSMA, SumTreeSMA}; - -/// 終値、取引高の単純移動平均のセット -#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct SMASet { - /// 終値 - pub close: f64, - /// 取引高 - pub volume: f64, -} - -impl From<&[Stock]> for SMASet { - fn from(value: &[Stock]) -> Self { - // 終値のN日と取引高のN日の単純移動平均 - let (closes, volumes) = value.iter().fold( - ( - SumTreeSMA::<_, f64, { N }>::new(), - SumTreeSMA::<_, f64, { N }>::new(), - ), - |acc, stock| { - let (mut acc_close, mut acc_volume) = acc; - acc_close.add_sample(stock.close); - acc_volume.add_sample(stock.volume as _); - (acc_close, acc_volume) - }, - ); - let close = closes.get_average(); - let volume = volumes.get_average(); - Self { close, volume } - } -} +use ta::indicators::SimpleMovingAverage; +use ta::Next; /// 終値、取引高の単純移動平均 #[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] pub struct SMA { - /// 終値、取引高のN日単純移動平均 - pub sma_n: SMASet, /// N日目の日付 pub date: NaiveDate, + /// 終値のN日単純移動平均 + pub close: close::model::F64, + /// 取引高のN日単純移動平均 + pub volume: volume::model::F64, } #[derive(Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] @@ -86,9 +60,21 @@ impl From<&[Stock]> for SMAs { fn from(value: &[Stock]) -> Self { let vec_sma = value .par_windows(N) - .map(|stocks| SMA { - sma_n: SMASet::::from(stocks), - date: stocks.last().unwrap().date, + .map(|stocks| { + // 終値のN日と取引高のN日の単純移動平均 + let mut sma_close = SimpleMovingAverage::new(N).unwrap(); + let mut sma_volume = SimpleMovingAverage::new(N).unwrap(); + let mut close = 0.0; + let mut volume = 0.0; + for stock in stocks { + close = sma_close.next(stock.close); + volume = sma_volume.next(stock.volume as f64); + } + SMA { + date: stocks.last().unwrap().date, + close: close::model::F64(close), + volume: volume::model::F64(volume), + } }) .collect::>>(); Self(vec_sma) diff --git a/src/domain/models/statement/model.rs b/src/domain/models/statement/model.rs index 680a5e9..3c71bae 100644 --- a/src/domain/models/statement/model.rs +++ b/src/domain/models/statement/model.rs @@ -4,7 +4,7 @@ use chrono::NaiveDate; /// /// This struct is designed to encapsulate the key financial data points for /// a company or entity, including net sales, profits, and assets. It can be -/// used to store financial data for reporting or analysis purposes. +/// used to store financial data for reporting or analysis_result purposes. /// /// # Fields /// diff --git a/src/domain/models/stocks_macoses_pair/model.rs b/src/domain/models/stocks_macoses_pair/model.rs deleted file mode 100644 index b124355..0000000 --- a/src/domain/models/stocks_macoses_pair/model.rs +++ /dev/null @@ -1,7 +0,0 @@ -use crate::domain::models::macos::model::MACOS; -use crate::domain::models::stock::model::Stock; - -pub struct StocksMACOSESPair<'a> { - pub stocks: &'a [Stock], - pub macoses: &'a [MACOS], -} diff --git a/src/domain/models/stocks_sma_coses_pair.rs b/src/domain/models/stocks_sma_coses_pair.rs new file mode 100644 index 0000000..65880be --- /dev/null +++ b/src/domain/models/stocks_sma_coses_pair.rs @@ -0,0 +1 @@ +pub mod model; diff --git a/src/domain/models/stocks_sma_coses_pair/model.rs b/src/domain/models/stocks_sma_coses_pair/model.rs new file mode 100644 index 0000000..24fd940 --- /dev/null +++ b/src/domain/models/stocks_sma_coses_pair/model.rs @@ -0,0 +1,7 @@ +use crate::domain::models::crossover_strategy::sma_cos::model::SmaCos; +use crate::domain::models::stock::model::Stock; + +pub struct StocksSmaCosesPair<'a> { + pub stocks: &'a [Stock], + pub sma_coses: &'a [SmaCos], +} diff --git a/src/domain/models/trend_reversal_analysis/model.rs b/src/domain/models/trend_reversal_analysis/model.rs index 6418dd3..7054eb8 100644 --- a/src/domain/models/trend_reversal_analysis/model.rs +++ b/src/domain/models/trend_reversal_analysis/model.rs @@ -2,121 +2,157 @@ use rayon::prelude::*; use crate::domain::models::buy_sell_signal::model::BuySellSignalType::{Buy, Sell, Stay}; use crate::domain::models::buy_sell_signal::model::{BuySellSignal, BuySellSignalType}; -use crate::domain::models::macos::model::MACOSes; -use crate::domain::models::macos::model::Pattern::{DeadCross, GoldenCross}; -use crate::domain::models::macps::model::MACPS; +use crate::domain::models::crossover_strategy::crossover_pattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern::{ + DeadCross, GoldenCross, +}; +use crate::domain::models::crossover_strategy::macd_cos::model::{MacdCos, MacdCoses}; +use crate::domain::models::crossover_strategy::sma_cos::model::{SmaCos, SmaCoses}; +use crate::domain::models::crossover_strategy::sma_cps::model::SmaCps; use chrono::NaiveDate; use serde::{Deserialize, Serialize}; -/// MACOS/MACPS/ECP2/MSESPの売買シグナルから相場転換を分析する +/// SmaCos/SmaCps/BodyEngulfing/MsEs/MacdCosの売買シグナルから相場転換を分析する #[derive(Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] pub struct TrendReversalAnalysis { pub r#type: BuySellSignalType, - pub macos: Option<(NaiveDate, BuySellSignalType)>, - pub ecp2: Option<(NaiveDate, BuySellSignalType)>, - pub msesp: Option<(NaiveDate, BuySellSignalType)>, - pub macps: Option<(NaiveDate, BuySellSignalType)>, + pub sma_cos: Option<(NaiveDate, BuySellSignalType)>, + pub sma_cps: Option<(NaiveDate, BuySellSignalType)>, + pub body_engulfing: Option<(NaiveDate, BuySellSignalType)>, + pub ms_es: Option<(NaiveDate, BuySellSignalType)>, + pub macd_cos: Option<(NaiveDate, BuySellSignalType)>, } -impl TrendReversalAnalysis { - fn latest_buy_sell_signal_date( - buy_sell_signal: &[BuySellSignal], - r#type: &BuySellSignalType, - ) -> Option { - buy_sell_signal - .par_iter() - .filter(|signal| signal.r#type.eq(r#type)) - .max_by(|a, b| Ord::cmp(&a.date, &b.date)) - .map(|signal| signal.date) - } +fn all_signals_match( + signal0: Option<(NaiveDate, BuySellSignalType)>, + signal1: Option<(NaiveDate, BuySellSignalType)>, + signal2: Option<(NaiveDate, BuySellSignalType)>, + signal3: Option<(NaiveDate, BuySellSignalType)>, + signal4: Option<(NaiveDate, BuySellSignalType)>, + target: BuySellSignalType, +) -> bool { + signal0.is_some_and(|s| s.1 == target) + && signal1.is_some_and(|s| s.1 == target) + && signal2.is_some_and(|s| s.1 == target) + && signal3.is_some_and(|s| s.1 == target) + && signal4.is_some_and(|s| s.1 == target) +} + +fn latest_buy_or_sell_signal_type( + buy_sell_signal: &[BuySellSignal], +) -> Option<(NaiveDate, BuySellSignalType)> { + buy_sell_signal + .par_iter() + .filter_map(|signal| { + matches!(signal.r#type, Buy | Sell).then_some((signal.date, signal.r#type)) + }) + .max_by(|(a, _), (b, _)| Ord::cmp(a, b)) +} - fn resolve_latest_signal( - buy_date: Option, - sell_date: Option, - ) -> Option<(NaiveDate, BuySellSignalType)> { - match (buy_date, sell_date) { - (Some(buy_date), Some(sell_date)) => { - if buy_date >= sell_date { - Some((buy_date, Buy)) - } else { - Some((sell_date, Sell)) - } +fn latest_signal_from_buy_sell_dates( + buy_date: Option, + sell_date: Option, +) -> Option<(NaiveDate, BuySellSignalType)> { + match (buy_date, sell_date) { + (Some(buy_date), Some(sell_date)) => { + if buy_date >= sell_date { + Some((buy_date, Buy)) + } else { + Some((sell_date, Sell)) } - (Some(buy_date), None) => Some((buy_date, Buy)), - (None, Some(sell_date)) => Some((sell_date, Sell)), - _ => None, } + (Some(buy_date), None) => Some((buy_date, Buy)), + (None, Some(sell_date)) => Some((sell_date, Sell)), + _ => None, } } +fn crossover_pattern_to_buy_sell_signal( + date: NaiveDate, + crossover_pattern: CrossoverPattern, +) -> Option<(NaiveDate, BuySellSignalType)> { + matches!(crossover_pattern, GoldenCross | DeadCross) + .then_some((date, crossover_pattern)) + .map(|(date, crossover_pattern)| (date, BuySellSignalType::from(crossover_pattern))) +} + pub struct TrendReversalAnalysisSet<'a> { - pub ecp2s: &'a [BuySellSignal], - pub msesps: &'a [BuySellSignal], - pub macps: &'a MACPS, - pub macoses: &'a MACOSes, + pub body_engulfings: &'a [BuySellSignal], + pub ms_eses: &'a [BuySellSignal], + pub sma_cps: &'a SmaCps, + pub sma_coses: &'a SmaCoses, + pub macd_coses: &'a MacdCoses, } impl<'a> From> for TrendReversalAnalysis { fn from(value: TrendReversalAnalysisSet<'a>) -> Self { let TrendReversalAnalysisSet { - macps, - macoses, - ecp2s, - msesps, + sma_cps, + sma_coses, + body_engulfings, + ms_eses, + macd_coses, } = value; - let macps = Self::resolve_latest_signal(macps.buy, macps.sell); - let macos_close_golden = macoses.latest_based_on_close(&GoldenCross); - let macos_close_dead = macoses.latest_based_on_close(&DeadCross); - let macos = Self::resolve_latest_signal(macos_close_golden, macos_close_dead); - let ecp2_buy = Self::latest_buy_sell_signal_date(ecp2s, &Buy); - let ecp2_sell = Self::latest_buy_sell_signal_date(ecp2s, &Sell); - let ecp2 = Self::resolve_latest_signal(ecp2_buy, ecp2_sell); - let msesp_buy = Self::latest_buy_sell_signal_date(msesps, &Buy); - let msesp_sell = Self::latest_buy_sell_signal_date(msesps, &Sell); - let msesp = Self::resolve_latest_signal(msesp_buy, msesp_sell); - // 終値のGoldenCross/ECP2 Buy/MSESP Buy/MACPS Buy が揃っていれば Buy - // 終値のDeadCross/ECP2 Sell/MSESP Sell/MACPS Sell が揃っていれば Sell + let sma_cos = sma_coses + .par_iter() + .filter_map( + |&SmaCos { + date, + crossover_pattern_close, + .. + }| { + let crossover_pattern::close::model::CrossoverPattern(crossover_pattern) = + crossover_pattern_close; + crossover_pattern_to_buy_sell_signal(date, crossover_pattern) + }, + ) + .max_by(|(a, _), (b, _)| Ord::cmp(a, b)); + let macd_cos = macd_coses + .par_iter() + .filter_map( + |&MacdCos { + date, + crossover_pattern, + .. + }| crossover_pattern_to_buy_sell_signal(date, crossover_pattern), + ) + .max_by(|(a, _), (b, _)| Ord::cmp(a, b)); + let sma_cps = latest_signal_from_buy_sell_dates(sma_cps.buy, sma_cps.sell); + let body_engulfing = latest_buy_or_sell_signal_type(body_engulfings); + let ms_es = latest_buy_or_sell_signal_type(ms_eses); + // 終値のSmaCos GoldenCross/MacdCos GoldenCross/BodyEngulfing Buy/MsEs Buy/SmaCps Buy が揃っていれば Buy + // 終値のSmaCos DeadCross/MacdCos DeadCross/BodyEngulfing Sell/MsEs Sell/SmaCps Sell が揃っていれば Sell // それ以外はStay - let r#type = match (macos, macps, ecp2, msesp) { - (Some(macos), Some(macps), Some(ecp2), Some(msesp)) - if macos.1.eq(&Buy) && macps.1.eq(&Buy) && ecp2.1.eq(&Buy) && msesp.1.eq(&Buy) => - { - Buy - } - (Some(macos), Some(macps), Some(ecp2), Some(msesp)) - if macos.1.eq(&Sell) - && macps.1.eq(&Sell) - && ecp2.1.eq(&Sell) - && msesp.1.eq(&Sell) => - { - Sell - } - _ => Stay, + let r#type = if all_signals_match(sma_cos, macd_cos, sma_cps, body_engulfing, ms_es, Buy) { + Buy + } else if all_signals_match(sma_cos, macd_cos, sma_cps, body_engulfing, ms_es, Sell) { + Sell + } else { + Stay }; Self { r#type, - macps, - macos, - ecp2, - msesp, + sma_cps, + sma_cos, + body_engulfing, + ms_es, + macd_cos, } } } #[cfg(test)] mod tests { - use anyhow::Result; - use bytes::Bytes; - use chrono::NaiveDate; - use pretty_assertions::assert_eq; - + use crate::domain::models::body_engulfing::model::BodyEngulfings; use crate::domain::models::buy_sell_signal::model::BuySellSignalType::{Buy, Sell, Stay}; use crate::domain::models::candle_stick::model::CandleSticks; - use crate::domain::models::ecp2::model::ECP2s; - use crate::domain::models::macos::model::MACOSes; - use crate::domain::models::macps::model::MACPS; - use crate::domain::models::msesp::model::MSESPes; + use crate::domain::models::crossover_strategy::macd_cos::model::MacdCoses; + use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; + use crate::domain::models::crossover_strategy::sma_cps::model::SmaCps; + use crate::domain::models::macd::model::MACDs; + use crate::domain::models::ms_es::model::MsEses; use crate::domain::models::sma::model::{SMAListPair, SMAListTrio, SMAs}; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysis; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysisSet; @@ -124,10 +160,17 @@ mod tests { use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::dsv::Dsv; use crate::infrastructure::repositories::stock::structures::internal::csv; + use anyhow::Result; + use bytes::Bytes; + use chrono::NaiveDate; + use pretty_assertions::assert_eq; const MARUBOZU_BODY_MIN_RATIO: usize = 90; const MARUBOZU_WICK_MAX_RATIO: usize = 2; const DOJI_MAX_BODY_RATIO: usize = 5; + const FAST_PERIOD: usize = 12; + const SLOW_PERIOD: usize = 26; + const SIGNAL_PERIOD: usize = 9; const CSV: &[u8] = include_bytes!("../../../../assets/8473.T.csv"); #[tokio::test] @@ -142,8 +185,8 @@ mod tests { MARUBOZU_WICK_MAX_RATIO, DOJI_MAX_BODY_RATIO, >::try_from(stocks.as_slice())?; - let ecp2s = ECP2s::from(candle_sticks.as_slice()); - let msespes = MSESPes::from(candle_sticks.as_slice()); + let body_engulfings = BodyEngulfings::from(candle_sticks.as_slice()); + let ms_eses = MsEses::from(candle_sticks.as_slice()); let smas_5 = SMAs::<5>::from(stocks.as_slice()); let smas_25 = SMAs::<25>::from(stocks.as_slice()); let smas_50 = SMAs::<50>::from(stocks.as_slice()); @@ -151,26 +194,30 @@ mod tests { smas_n: smas_5.as_slice(), smas_o: smas_25.as_slice(), }; - let macoses = MACOSes::from(sma_list_pair); + let sma_coses = SmaCoses::from(sma_list_pair); let sma_list_trio = SMAListTrio { smas_n: smas_5.as_slice(), smas_o: smas_25.as_slice(), smas_p: smas_50.as_slice(), }; - let macps = MACPS::from((stocks.as_slice(), sma_list_trio)); - let candle_stick_pattern_set = TrendReversalAnalysisSet { - ecp2s: &ecp2s, - msesps: &msespes, - macps: &macps, - macoses: &macoses, + let sma_cps = SmaCps::from((stocks.as_slice(), sma_list_trio)); + let macds = MACDs::::from(stocks.as_slice()); + let macd_coses = MacdCoses::from(macds); + let trend_reversal_analysis_set = TrendReversalAnalysisSet { + body_engulfings: &body_engulfings, + ms_eses: &ms_eses, + sma_cps: &sma_cps, + sma_coses: &sma_coses, + macd_coses: &macd_coses, }; - let actual = TrendReversalAnalysis::from(candle_stick_pattern_set); + let actual = TrendReversalAnalysis::from(trend_reversal_analysis_set); let expected = TrendReversalAnalysis { r#type: Stay, - macos: NaiveDate::from_ymd_opt(2023, 8, 30).map(|date| (date, Buy)), - ecp2: NaiveDate::from_ymd_opt(2023, 8, 14).map(|date| (date, Sell)), - msesp: NaiveDate::from_ymd_opt(2023, 5, 24).map(|date| (date, Sell)), - macps: NaiveDate::from_ymd_opt(2023, 9, 8).map(|date| (date, Sell)), + sma_cos: NaiveDate::from_ymd_opt(2023, 8, 30).map(|date| (date, Buy)), + body_engulfing: NaiveDate::from_ymd_opt(2023, 8, 14).map(|date| (date, Sell)), + ms_es: NaiveDate::from_ymd_opt(2023, 5, 24).map(|date| (date, Sell)), + sma_cps: NaiveDate::from_ymd_opt(2023, 9, 8).map(|date| (date, Sell)), + macd_cos: NaiveDate::from_ymd_opt(2023, 8, 30).map(|date| (date, Buy)), }; assert_eq!(actual, expected); Ok(()) diff --git a/src/domain/models/volume.rs b/src/domain/models/volume.rs new file mode 100644 index 0000000..65880be --- /dev/null +++ b/src/domain/models/volume.rs @@ -0,0 +1 @@ +pub mod model; diff --git a/src/domain/models/volume/model.rs b/src/domain/models/volume/model.rs new file mode 100644 index 0000000..8293be9 --- /dev/null +++ b/src/domain/models/volume/model.rs @@ -0,0 +1,2 @@ +#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct F64(pub f64); diff --git a/src/infrastructure/repositories/company/jquants_api.rs b/src/infrastructure/repositories/company/jquants_api.rs index c11621a..900cd38 100644 --- a/src/infrastructure/repositories/company/jquants_api.rs +++ b/src/infrastructure/repositories/company/jquants_api.rs @@ -1,15 +1,14 @@ -use anyhow::{Context, Result, bail}; +use crate::domain::models::company::model; +use crate::domain::repositories::company::{queries, repository}; +use crate::infrastructure::jquants_api::JQuantsAPI; +use crate::infrastructure::repositories::company::structures::jquants_api::Response; +use anyhow::{bail, Context, Result}; use async_trait::async_trait; use query_string_builder::QueryString; use rayon::prelude::*; use reqwest::Client; use serde_json::Value; -use crate::domain::models::company::model; -use crate::domain::repositories::company::{queries, repository}; -use crate::infrastructure::jquants_api::JQuantsAPI; -use crate::infrastructure::repositories::company::structures::jquants_api::Response; - const COMPANY_URL: &str = "https://api.jquants.com/v2/equities/master"; #[async_trait] @@ -53,9 +52,7 @@ impl repository::Company for JQuantsAPI { #[cfg(test)] mod tests { use anyhow::Result; - use bytestring::ByteString; use pretty_assertions::assert_eq; - use rstest::*; use crate::domain::models::company::model; use crate::domain::repositories::company::queries; @@ -63,15 +60,9 @@ mod tests { use crate::infrastructure::jquants_api::JQuantsAPI; use crate::shared::jquants_api::setup::Setup; - #[fixture] - async fn setup() -> Result { - Setup::run().await - } - - #[rstest] #[tokio::test] - async fn get_row_company_test(#[future] setup: Result) -> Result<()> { - let token = setup.await?; + async fn get_row_company_test() -> Result<()> { + let token = Setup::run()?; let repository = JQuantsAPI::new(token)?; let query = queries::get_company::Query { code: "8473", @@ -88,10 +79,9 @@ mod tests { Ok(()) } - #[rstest] #[tokio::test] - async fn get_vec_row_company_test(#[future] setup: Result) -> Result<()> { - let token = setup.await?; + async fn get_vec_row_company_test() -> Result<()> { + let token = Setup::run()?; let repository = JQuantsAPI::new(token)?; let vec_row_company = repository.get_vec_row_company().await?; assert!(vec_row_company.len() > 4400); diff --git a/src/infrastructure/repositories/statement/jquants_api.rs b/src/infrastructure/repositories/statement/jquants_api.rs index a9055d3..2ec3505 100644 --- a/src/infrastructure/repositories/statement/jquants_api.rs +++ b/src/infrastructure/repositories/statement/jquants_api.rs @@ -64,10 +64,8 @@ mod tests { use crate::infrastructure::repositories::statement::jquants_api::select_statement_record; use crate::shared::jquants_api::setup::Setup; use anyhow::Result; - use bytestring::ByteString; use chrono::NaiveDate; use pretty_assertions::assert_eq; - use rstest::*; use serde_json::json; #[test] @@ -91,29 +89,23 @@ mod tests { assert!(selected.is_none()); } - #[fixture] - async fn setup() -> Result { - Setup::run().await - } - - #[rstest] #[tokio::test] - async fn get_row_statement_test(#[future] setup: Result) -> Result<()> { - let token = setup.await?; + async fn get_row_statement_test() -> Result<()> { + let token = Setup::run()?; let repository = JQuantsAPI::new(token)?; let query = queries::get_statement::Query { code: "8473" }; let actual = repository.get_row_statement(&query).await?; let expected = model::RowStatement { code: "8473".to_string(), - disclosed_date: NaiveDate::from_ymd_opt(2026, 3, 13), - eps: None, - bps: None, - net_sales: None, + disclosed_date: NaiveDate::from_ymd_opt(2026, 5, 1), + eps: Some(666.82), + bps: Some(2776.99), + net_sales: Some(1_896_607_000_000.0), opp: None, orp: None, - profit: None, - equity: None, - total_assets: None, + profit: Some(427_577_000_000.0), + equity: Some(2_413_363_000_000.0), + total_assets: Some(38_290_797_000_000.0), }; assert_eq!(actual, expected); diff --git a/src/infrastructure/repositories/stock/jquants_api.rs b/src/infrastructure/repositories/stock/jquants_api.rs index d9bd1d0..52ccedd 100644 --- a/src/infrastructure/repositories/stock/jquants_api.rs +++ b/src/infrastructure/repositories/stock/jquants_api.rs @@ -1,14 +1,13 @@ +use crate::domain::models::stock::model; +use crate::domain::repositories::stock::{queries, repository}; +use crate::infrastructure::jquants_api::JQuantsAPI; +use crate::infrastructure::repositories::stock::structures::jquants_api::Response; use anyhow::Context; use async_trait::async_trait; use query_string_builder::QueryString; use rayon::prelude::*; use reqwest::Client; -use crate::domain::models::stock::model; -use crate::domain::repositories::stock::{queries, repository}; -use crate::infrastructure::jquants_api::JQuantsAPI; -use crate::infrastructure::repositories::stock::structures::jquants_api::Response; - const DAILY_QUOTES_URL: &str = "https://api.jquants.com/v2/equities/bars/daily"; #[async_trait] @@ -60,26 +59,17 @@ impl repository::Stock for JQuantsAPI { } #[cfg(test)] mod tests { - use bytestring::ByteString; - use chrono::NaiveDate; - use pretty_assertions::assert_eq; - use rstest::*; - use crate::domain::models::stock::model; use crate::domain::repositories::stock::queries; use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::jquants_api::JQuantsAPI; use crate::shared::jquants_api::setup::Setup; + use chrono::NaiveDate; + use pretty_assertions::assert_eq; - #[fixture] - async fn setup() -> anyhow::Result { - Setup::run().await - } - - #[rstest] #[tokio::test] - async fn get_row_stock_test(#[future] setup: anyhow::Result) -> anyhow::Result<()> { - let token = setup.await?; + async fn get_row_stock_test() -> anyhow::Result<()> { + let token = Setup::run()?; let repository = JQuantsAPI::new(token)?; let query = queries::get_stock::Query { code: Some("84730"), @@ -100,12 +90,9 @@ mod tests { Ok(()) } - #[rstest] #[tokio::test] - async fn get_vec_row_stock_test( - #[future] setup: anyhow::Result, - ) -> anyhow::Result<()> { - let token = setup.await?; + async fn get_vec_row_stock_test() -> anyhow::Result<()> { + let token = Setup::run()?; let repository = JQuantsAPI::new(token)?; let query = queries::get_stocks::Query { code: Some("84730"), diff --git a/src/presenter/presenters/trend_analysis/output.rs b/src/presenter/presenters/trend_analysis/output.rs index 8ebc1cc..d81f0dd 100644 --- a/src/presenter/presenters/trend_analysis/output.rs +++ b/src/presenter/presenters/trend_analysis/output.rs @@ -1,11 +1,10 @@ use crate::domain::models::candle_stick::model::CandleSticks; use crate::domain::models::company::model::Company; -use crate::domain::models::ecp1::model::ECP1s; -use crate::domain::models::macos::model::MACOSes; -use crate::domain::models::macos_analysis::close::model::{ - LatestChance, MACOSAnalysisCloses, RateOfChance, -}; -use crate::domain::models::macos_analysis::volume::model::MACOSAnalysisVolumes; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; +use crate::domain::models::crossover_strategy::sma_cos::analysis_result; +use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; +use crate::domain::models::high_low_direction_signal::model::HighLowDirectionSignals; use crate::domain::models::sma::model::SMAs; use crate::domain::models::stock::model::Stocks; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysis; @@ -17,12 +16,12 @@ pub struct TrendAnalysis, pub smas_25: SMAs<25>, pub smas_50: SMAs<50>, - pub macoses: MACOSes, - pub macos_analysis_closes: MACOSAnalysisCloses, + pub sma_coses: SmaCoses, + pub sma_cos_analysis_result_closes: analysis_result::close::model::AnalysisResults, pub rate_of_chance: RateOfChance, pub latest_chance: LatestChance, - pub macos_analysis_volumes: MACOSAnalysisVolumes, - pub ecp1s: ECP1s, + pub sma_cos_analysis_result_volumes: analysis_result::volume::model::AnalysisResults, + pub high_low_direction_signals: HighLowDirectionSignals, pub candle_sticks: CandleSticks, pub trend_reversal_analysis: TrendReversalAnalysis, pub crossover_pattern_filter: CrossoverPatternFilter, diff --git a/src/presenter/presenters/trend_analysis/response.rs b/src/presenter/presenters/trend_analysis/response.rs index 71abe99..8d269c7 100644 --- a/src/presenter/presenters/trend_analysis/response.rs +++ b/src/presenter/presenters/trend_analysis/response.rs @@ -1,10 +1,10 @@ -use deref_derive::{Deref, DerefMut}; - use crate::domain::models::company::model::Company; -use crate::domain::models::ecp1::model::ECP1s; -use crate::domain::models::macos_analysis::close::model::{LatestChance, RateOfChance}; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; +use crate::domain::models::high_low_direction_signal::model::HighLowDirectionSignals; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysis; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; +use deref_derive::{Deref, DerefMut}; pub mod chart; pub mod json; @@ -23,7 +23,7 @@ pub enum TrendAnalysis { crossover_pattern_filter: CrossoverPatternFilter, rate_of_chance: RateOfChance, latest_chance: LatestChance, - ecp1s: ECP1s, + high_low_direction_signals: HighLowDirectionSignals, trend_reversal_analysis: TrendReversalAnalysis, }, } diff --git a/src/presenter/presenters/trend_analysis/response/chart.rs b/src/presenter/presenters/trend_analysis/response/chart.rs index 61e51f1..862d426 100644 --- a/src/presenter/presenters/trend_analysis/response/chart.rs +++ b/src/presenter/presenters/trend_analysis/response/chart.rs @@ -6,16 +6,16 @@ use charts_rs::{ use rayon::prelude::*; use std::backtrace::Backtrace; -use crate::domain::models::macos::model::Pattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; use crate::presenter::presenters::trend_analysis::output; use crate::presenter::presenters::trend_analysis::presenter; use crate::presenter::presenters::trend_analysis::response; use crate::presenter::views::candle_stick::view::CandleSticks; -use crate::presenter::views::macos_analysis::close::view::MACOSAnalysisCloses; -use crate::presenter::views::macos_analysis::view::MACOSes; -use crate::presenter::views::macos_analysis::volume::view::MACOSTrendAnalysisVolumes; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; use crate::presenter::views::sma::view::SMAs; +use crate::presenter::views::sma_cos_analysis::close::view::SmaCosAnalysis as SmaCosAnalysisClose; +use crate::presenter::views::sma_cos_analysis::view::SmaCoses; +use crate::presenter::views::sma_cos_analysis::volume::view::SmaCosAnalysis as SmaCosAnalysisVolume; use crate::presenter::views::stock::view::Stocks; use crate::shared::float; @@ -52,12 +52,12 @@ impl presenter::TrendAnalysis for Chart { charts.margin = 5.0.into(); let company = output.company; - let sma_5_averages = output.smas_5.sma_n_closes(); - let sma_25_averages = output.smas_25.sma_n_closes(); - let sma_50_averages = output.smas_50.sma_n_closes(); + let sma_5_closes = output.smas_5.sma_closes(); + let sma_25_closes = output.smas_25.sma_closes(); + let sma_50_closes = output.smas_50.sma_closes(); let ohlcs: Vec = output .stocks - .ohlces() + .ohlcs() .par_iter() .map(|value| *value as _) .collect(); @@ -68,34 +68,38 @@ impl presenter::TrendAnalysis for Chart { let series_list = match output.crossover_pattern_filter { CrossoverPatternFilter::Both => { - let dead_macoses = output.macoses.sma_25_closes(Pattern::DeadCross); - let golden_macoses = output.macoses.sma_25_closes(Pattern::GoldenCross); + let dead_crosses = output.sma_coses.sma_25_closes(CrossoverPattern::DeadCross); + let golden_crosses = output + .sma_coses + .sma_25_closes(CrossoverPattern::GoldenCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("SMA50", sma_50_averages)), - Series::from(("Dead", dead_macoses)), - Series::from(("Golden", golden_macoses)), + Series::from(("SMA5", sma_5_closes)), + Series::from(("SMA25", sma_25_closes)), + Series::from(("SMA50", sma_50_closes)), + Series::from(("Dead", dead_crosses)), + Series::from(("Golden", golden_crosses)), Series::from(("OHLC", ohlcs)), ] } CrossoverPatternFilter::GoldenOnly => { - let golden_macoses = output.macoses.sma_25_closes(Pattern::GoldenCross); + let golden_crosses = output + .sma_coses + .sma_25_closes(CrossoverPattern::GoldenCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("SMA50", sma_50_averages)), - Series::from(("Golden", golden_macoses)), + Series::from(("SMA5", sma_5_closes)), + Series::from(("SMA25", sma_25_closes)), + Series::from(("SMA50", sma_50_closes)), + Series::from(("Golden", golden_crosses)), Series::from(("OHLC", ohlcs)), ] } CrossoverPatternFilter::DeadOnly => { - let dead_macoses = output.macoses.sma_25_closes(Pattern::DeadCross); + let dead_crosses = output.sma_coses.sma_25_closes(CrossoverPattern::DeadCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("SMA50", sma_50_averages)), - Series::from(("Dead", dead_macoses)), + Series::from(("SMA5", sma_5_closes)), + Series::from(("SMA25", sma_25_closes)), + Series::from(("SMA50", sma_50_closes)), + Series::from(("Dead", dead_crosses)), Series::from(("OHLC", ohlcs)), ] } @@ -143,8 +147,8 @@ impl presenter::TrendAnalysis for Chart { candlestick_chart.candlestick_down_border_color = Color::from((0, 40, 143)); charts.add(ChildChart::Candlestick(candlestick_chart, None)); - let sma_5_averages = output.smas_5.sma_n_volumes(); - let sma_25_averages = output.smas_25.sma_n_volumes(); + let sma_5_volumes = output.smas_5.sma_volumes(); + let sma_25_volumes = output.smas_25.sma_volumes(); let volumes: Vec = output .stocks .volumes() @@ -154,31 +158,35 @@ impl presenter::TrendAnalysis for Chart { let series_list = match output.crossover_pattern_filter { CrossoverPatternFilter::Both => { - let dead_macoses = output.macoses.sma_25_volumes(Pattern::DeadCross); - let golden_macoses = output.macoses.sma_25_volumes(Pattern::GoldenCross); + let dead_crosses = output.sma_coses.sma_25_volumes(CrossoverPattern::DeadCross); + let golden_crosses = output + .sma_coses + .sma_25_volumes(CrossoverPattern::GoldenCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("Dead", dead_macoses)), - Series::from(("Golden", golden_macoses)), + Series::from(("SMA5", sma_5_volumes)), + Series::from(("SMA25", sma_25_volumes)), + Series::from(("Dead", dead_crosses)), + Series::from(("Golden", golden_crosses)), Series::from(("Volume", volumes)), ] } CrossoverPatternFilter::GoldenOnly => { - let golden_macoses = output.macoses.sma_25_volumes(Pattern::GoldenCross); + let golden_crosses = output + .sma_coses + .sma_25_volumes(CrossoverPattern::GoldenCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("Golden", golden_macoses)), + Series::from(("SMA5", sma_5_volumes)), + Series::from(("SMA25", sma_25_volumes)), + Series::from(("Golden", golden_crosses)), Series::from(("Volume", volumes)), ] } CrossoverPatternFilter::DeadOnly => { - let dead_macoses = output.macoses.sma_25_volumes(Pattern::DeadCross); + let dead_crosses = output.sma_coses.sma_25_volumes(CrossoverPattern::DeadCross); vec![ - Series::from(("SMA5", sma_5_averages)), - Series::from(("SMA25", sma_25_averages)), - Series::from(("Dead", dead_macoses)), + Series::from(("SMA5", sma_5_volumes)), + Series::from(("SMA25", sma_25_volumes)), + Series::from(("Dead", dead_crosses)), Series::from(("Volume", volumes)), ] } @@ -210,12 +218,12 @@ impl presenter::TrendAnalysis for Chart { } charts.add(ChildChart::Bar(volume_chart, None)); - let mut rows = output.macos_analysis_closes.table_chart_header(); + let mut rows = output.sma_cos_analysis_result_closes.table_chart_header(); let mut body = output - .macos_analysis_closes + .sma_cos_analysis_result_closes .table_chart_rows(&output.crossover_pattern_filter); rows.append(&mut body); - let rate_of_chance = output.macos_analysis_closes.rate_of_chance(); + let rate_of_chance = output.sma_cos_analysis_result_closes.rate_of_chance(); let mut summary = rate_of_chance.table_chart_summary(&output.crossover_pattern_filter); rows.append(&mut summary); let mut table_chart = TableChart::new_with_theme(rows, self.theme.as_str()); @@ -223,9 +231,9 @@ impl presenter::TrendAnalysis for Chart { table_chart.width = self.width; charts.add(ChildChart::Table(table_chart, None)); - let mut rows = output.macos_analysis_volumes.table_chart_header(); + let mut rows = output.sma_cos_analysis_result_volumes.table_chart_header(); let mut body = output - .macos_analysis_volumes + .sma_cos_analysis_result_volumes .table_chart_rows(&output.crossover_pattern_filter); rows.append(&mut body); let mut table_chart = TableChart::new_with_theme(rows, self.theme.as_str()); diff --git a/src/presenter/presenters/trend_analysis/response/json.rs b/src/presenter/presenters/trend_analysis/response/json.rs index c39bd62..9f81ca6 100644 --- a/src/presenter/presenters/trend_analysis/response/json.rs +++ b/src/presenter/presenters/trend_analysis/response/json.rs @@ -16,7 +16,7 @@ impl presenter::TrendAnalysis for JSON { crossover_pattern_filter: output.crossover_pattern_filter, rate_of_chance: output.rate_of_chance, latest_chance: output.latest_chance, - ecp1s: output.ecp1s, + high_low_direction_signals: output.high_low_direction_signals, trend_reversal_analysis: output.trend_reversal_analysis, }) } diff --git a/src/presenter/presenters/trend_analysis_summary/response/chart.rs b/src/presenter/presenters/trend_analysis_summary/response/chart.rs index 5e5cabd..890d6f6 100644 --- a/src/presenter/presenters/trend_analysis_summary/response/chart.rs +++ b/src/presenter/presenters/trend_analysis_summary/response/chart.rs @@ -35,7 +35,7 @@ impl presenter::TrendAnalysisSummary for Chart { let mut rows = vec![vec![ "code".to_string(), "symbol".to_string(), - "macos type".to_string(), + "sma cos".to_string(), "latest".to_string(), chance_rate, ]]; diff --git a/src/presenter/views.rs b/src/presenter/views.rs index 34d93ed..766ed72 100644 --- a/src/presenter/views.rs +++ b/src/presenter/views.rs @@ -1,13 +1,13 @@ -pub mod buy_sell_signal_analysis; pub mod candle_stick; pub mod financial_indicator; pub mod financial_indicator_summary; +pub mod high_low_direction_signal_analysis; pub mod latest_chance; -pub mod macos_analysis; -pub mod macps_analysis; pub mod rate_of_chance; pub mod shared; pub mod sma; +pub mod sma_cos_analysis; +pub mod sma_cps_analysis; pub mod stock; pub mod trend_analysis_summary; pub mod trend_reversal_analysis; diff --git a/src/presenter/views/buy_sell_signal_analysis.rs b/src/presenter/views/high_low_direction_signal_analysis.rs similarity index 100% rename from src/presenter/views/buy_sell_signal_analysis.rs rename to src/presenter/views/high_low_direction_signal_analysis.rs diff --git a/src/presenter/views/buy_sell_signal_analysis/view.rs b/src/presenter/views/high_low_direction_signal_analysis/view.rs similarity index 70% rename from src/presenter/views/buy_sell_signal_analysis/view.rs rename to src/presenter/views/high_low_direction_signal_analysis/view.rs index c722066..4d90501 100644 --- a/src/presenter/views/buy_sell_signal_analysis/view.rs +++ b/src/presenter/views/high_low_direction_signal_analysis/view.rs @@ -1,31 +1,30 @@ +use crate::domain::models::buy_sell_signal::model; +use crate::domain::models::buy_sell_signal::model::BuySellSignalType; +use crate::shared::custom_serde::naive_date; use chrono::NaiveDate; use deref_derive::{Deref, DerefMut}; use rayon::prelude::*; use serde::{Deserialize, Serialize}; -use crate::domain::models::buy_sell_signal::model; -use crate::domain::models::buy_sell_signal::model::BuySellSignalType; -use crate::shared::custom_serde::naive_date; - #[derive(Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default)] -pub struct BuySellSignal { +pub struct HighLowDirectionSignal { pub r#type: BuySellSignalType, #[serde(with = "naive_date::primitive")] pub date: NaiveDate, } #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, PartialOrd, Default, Deref, DerefMut)] -pub struct BuySellSignalAnalysis(Vec); +pub struct HighLowDirectionSignalAnalysis(Vec); -impl From<&[model::BuySellSignal]> for BuySellSignalAnalysis { +impl From<&[model::BuySellSignal]> for HighLowDirectionSignalAnalysis { fn from(value: &[model::BuySellSignal]) -> Self { - let vec_buy_sell_signal = value + let vec_high_low_direction_signal = value .par_iter() - .map(|element| BuySellSignal { + .map(|element| HighLowDirectionSignal { r#type: element.r#type, date: element.date, }) .collect(); - Self(vec_buy_sell_signal) + Self(vec_high_low_direction_signal) } } diff --git a/src/presenter/views/latest_chance/view.rs b/src/presenter/views/latest_chance/view.rs index f7a29ca..14e27c9 100644 --- a/src/presenter/views/latest_chance/view.rs +++ b/src/presenter/views/latest_chance/view.rs @@ -1,7 +1,7 @@ use chrono::NaiveDate; use std::fmt; -use crate::domain::models::macos_analysis::close::model::LatestChance; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; use crate::shared::custom_serde::naive_date::ISO8601_DATE_FORMAT; impl fmt::Display for LatestChance { diff --git a/src/presenter/views/macos_analysis/view.rs b/src/presenter/views/macos_analysis/view.rs deleted file mode 100644 index dd51121..0000000 --- a/src/presenter/views/macos_analysis/view.rs +++ /dev/null @@ -1,82 +0,0 @@ -use charts_rs::NIL_VALUE; -use chrono::NaiveDate; -use rayon::prelude::*; -use serde::{Deserialize, Serialize}; - -use crate::domain::models::macos::model; -use crate::domain::models::macos::model::MACOS; -use crate::domain::models::macos_analysis::close::model::{LatestChance, RateOfChance}; -use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; -use crate::shared::custom_serde::naive_date; - -#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACOSAnalysis { - pub pattern: model::Pattern, - #[serde(with = "naive_date::primitive")] - pub latest_chance: NaiveDate, - pub rate_of_chance: f64, -} - -impl From<(&CrossoverPatternFilter, &RateOfChance, &LatestChance)> for MACOSAnalysis { - fn from(value: (&CrossoverPatternFilter, &RateOfChance, &LatestChance)) -> Self { - let (crossover_pattern_filter, rate_of_chance, latest_chance) = value; - let latest_chance = crossover_pattern_filter.get_latest_chance(latest_chance); - let pattern = model::Pattern::from(latest_chance); - let latest_chance = NaiveDate::from(latest_chance); - let rate_of_chance = crossover_pattern_filter.get_rate_of_chance(rate_of_chance); - Self { - pattern, - latest_chance, - rate_of_chance, - } - } -} - -pub trait MACOSes { - fn sma_25_closes(&self, filter_pattern: model::Pattern) -> Vec; - fn sma_25_volumes(&self, filter_pattern: model::Pattern) -> Vec; -} - -impl MACOSes for model::MACOSes { - fn sma_25_closes(&self, filter_pattern: model::Pattern) -> Vec { - self.par_iter() - .map(|macos| { - let MACOS { - pattern_close_volume, - sma_set_25, - .. - } = macos; - pattern_close_volume.close.value_if_patterns_match( - filter_pattern, - sma_set_25.map(|sma_set| sma_set.close), - ) - }) - .collect() - } - - fn sma_25_volumes(&self, filter_pattern: model::Pattern) -> Vec { - self.par_iter() - .map(|macos| { - let MACOS { - pattern_close_volume, - sma_set_25, - .. - } = macos; - pattern_close_volume.volume.value_if_patterns_match( - filter_pattern, - sma_set_25.map(|sma_set| sma_set.volume), - ) - }) - .collect() - } -} - -impl model::Pattern { - fn value_if_patterns_match(&self, rhs: Self, value: Option) -> f32 { - if self.eq(&rhs) { - value.map_or(NIL_VALUE, |value| value as _) - } else { - NIL_VALUE - } - } -} diff --git a/src/presenter/views/rate_of_chance/view.rs b/src/presenter/views/rate_of_chance/view.rs index 7dd2a7a..cbba2a5 100644 --- a/src/presenter/views/rate_of_chance/view.rs +++ b/src/presenter/views/rate_of_chance/view.rs @@ -1,4 +1,4 @@ -use crate::domain::models::macos_analysis::close::model::RateOfChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; impl RateOfChance { @@ -17,19 +17,18 @@ impl RateOfChance { #[cfg(test)] mod tests { - use anyhow::Result; - use bytes::Bytes; - use pretty_assertions::assert_eq; - - use crate::domain::models::macos::model::MACOSes; - use crate::domain::models::macos_analysis::close::model::MACOSAnalysisCloses; + use crate::domain::models::crossover_strategy::sma_cos::analysis_result::close::model::AnalysisResults; + use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; use crate::domain::models::sma::model::{SMAListPair, SMAs}; - use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; + use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; use crate::domain::repositories::stock::queries; use crate::domain::repositories::stock::repository::Stock; use crate::infrastructure::dsv::Dsv; use crate::infrastructure::repositories::stock::structures::internal::csv; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; + use anyhow::Result; + use bytes::Bytes; + use pretty_assertions::assert_eq; const AFTER_DAYS: usize = 5; const CSV: &[u8] = include_bytes!("../../../../assets/8473.T.csv"); @@ -47,13 +46,13 @@ mod tests { smas_n: smas_5.as_slice(), smas_o: smas_25.as_slice(), }; - let macoses = MACOSes::from(sma_list_pair); - let stocks_macoses_pair = StocksMACOSESPair { + let sma_coses = SmaCoses::from(sma_list_pair); + let stocks_sma_coses_pair = StocksSmaCosesPair { stocks: stocks.as_slice(), - macoses: macoses.as_slice(), + sma_coses: sma_coses.as_slice(), }; - let macos_analysis_closes = MACOSAnalysisCloses::::from(&stocks_macoses_pair); - let rate_of_chance = macos_analysis_closes.rate_of_chance(); + let analysis_results = AnalysisResults::::from(&stocks_sma_coses_pair); + let rate_of_chance = analysis_results.rate_of_chance(); let summary = rate_of_chance.table_chart_summary(&CrossoverPatternFilter::Both); assert_eq!( summary, diff --git a/src/presenter/views/shared/crossover_pattern_filter.rs b/src/presenter/views/shared/crossover_pattern_filter.rs index e557d35..78fd8aa 100644 --- a/src/presenter/views/shared/crossover_pattern_filter.rs +++ b/src/presenter/views/shared/crossover_pattern_filter.rs @@ -1,5 +1,6 @@ -use crate::domain::models::macos::model; -use crate::domain::models::macos_analysis::close::model::{LatestChance, RateOfChance}; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; use strum::Display; /// クロスオーバーのどのパターン(ゴールデンクロス、デッドクロス、または両方)を @@ -23,11 +24,13 @@ impl CrossoverPatternFilter { /// /// # 戻り値 /// フィルター条件に一致する場合は `true`、そうでない場合は `false`。 - pub fn matches_filter(&self, pattern: &model::Pattern) -> bool { + pub fn matches_filter(&self, crossover_pattern: &CrossoverPattern) -> bool { match self { CrossoverPatternFilter::Both => true, - CrossoverPatternFilter::GoldenOnly => pattern.eq(&model::Pattern::GoldenCross), - CrossoverPatternFilter::DeadOnly => pattern.eq(&model::Pattern::DeadCross), + CrossoverPatternFilter::GoldenOnly => { + crossover_pattern.eq(&CrossoverPattern::GoldenCross) + } + CrossoverPatternFilter::DeadOnly => crossover_pattern.eq(&CrossoverPattern::DeadCross), } } @@ -85,11 +88,11 @@ impl CrossoverPatternFilter { #[cfg(test)] mod tests { - use chrono::NaiveDate; - - use crate::domain::models::macos::model; - use crate::domain::models::macos_analysis::close::model::{LatestChance, RateOfChance}; + use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; + use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; + use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; + use chrono::NaiveDate; fn ymd(year: i32, month: u32, day: u32) -> NaiveDate { NaiveDate::from_ymd_opt(year, month, day).unwrap() @@ -97,17 +100,17 @@ mod tests { #[test] fn matches_filter_test() { - assert!(CrossoverPatternFilter::Both.matches_filter(&model::Pattern::GoldenCross)); - assert!(CrossoverPatternFilter::Both.matches_filter(&model::Pattern::DeadCross)); - assert!(CrossoverPatternFilter::Both.matches_filter(&model::Pattern::Neither)); // NeutralもBothではtrue + assert!(CrossoverPatternFilter::Both.matches_filter(&CrossoverPattern::GoldenCross)); + assert!(CrossoverPatternFilter::Both.matches_filter(&CrossoverPattern::DeadCross)); + assert!(CrossoverPatternFilter::Both.matches_filter(&CrossoverPattern::Neither)); // NeutralもBothではtrue - assert!(CrossoverPatternFilter::GoldenOnly.matches_filter(&model::Pattern::GoldenCross)); - assert!(!CrossoverPatternFilter::GoldenOnly.matches_filter(&model::Pattern::DeadCross)); - assert!(!CrossoverPatternFilter::GoldenOnly.matches_filter(&model::Pattern::Neither)); + assert!(CrossoverPatternFilter::GoldenOnly.matches_filter(&CrossoverPattern::GoldenCross)); + assert!(!CrossoverPatternFilter::GoldenOnly.matches_filter(&CrossoverPattern::DeadCross)); + assert!(!CrossoverPatternFilter::GoldenOnly.matches_filter(&CrossoverPattern::Neither)); - assert!(!CrossoverPatternFilter::DeadOnly.matches_filter(&model::Pattern::GoldenCross)); - assert!(CrossoverPatternFilter::DeadOnly.matches_filter(&model::Pattern::DeadCross)); - assert!(!CrossoverPatternFilter::DeadOnly.matches_filter(&model::Pattern::Neither)); + assert!(!CrossoverPatternFilter::DeadOnly.matches_filter(&CrossoverPattern::GoldenCross)); + assert!(CrossoverPatternFilter::DeadOnly.matches_filter(&CrossoverPattern::DeadCross)); + assert!(!CrossoverPatternFilter::DeadOnly.matches_filter(&CrossoverPattern::Neither)); } #[test] diff --git a/src/presenter/views/sma/view.rs b/src/presenter/views/sma/view.rs index 0e73517..efd2e8a 100644 --- a/src/presenter/views/sma/view.rs +++ b/src/presenter/views/sma/view.rs @@ -1,18 +1,17 @@ -use rayon::prelude::*; - use crate::domain::models::sma::model; +use rayon::prelude::*; pub trait SMAs { - fn sma_n_closes(&self) -> Vec; - fn sma_n_volumes(&self) -> Vec; + fn sma_closes(&self) -> Vec; + fn sma_volumes(&self) -> Vec; } impl SMAs for model::SMAs { - fn sma_n_closes(&self) -> Vec { - self.par_iter().map(|sma| sma.sma_n.close as _).collect() + fn sma_closes(&self) -> Vec { + self.par_iter().map(|sma| sma.close.0 as _).collect() } - fn sma_n_volumes(&self) -> Vec { - self.par_iter().map(|sma| sma.sma_n.volume as _).collect() + fn sma_volumes(&self) -> Vec { + self.par_iter().map(|sma| sma.volume.0 as _).collect() } } diff --git a/src/presenter/views/macos_analysis.rs b/src/presenter/views/sma_cos_analysis.rs similarity index 100% rename from src/presenter/views/macos_analysis.rs rename to src/presenter/views/sma_cos_analysis.rs diff --git a/src/presenter/views/macos_analysis/close.rs b/src/presenter/views/sma_cos_analysis/close.rs similarity index 100% rename from src/presenter/views/macos_analysis/close.rs rename to src/presenter/views/sma_cos_analysis/close.rs diff --git a/src/presenter/views/macos_analysis/close/view.rs b/src/presenter/views/sma_cos_analysis/close/view.rs similarity index 64% rename from src/presenter/views/macos_analysis/close/view.rs rename to src/presenter/views/sma_cos_analysis/close/view.rs index 7bda92c..d61c059 100644 --- a/src/presenter/views/macos_analysis/close/view.rs +++ b/src/presenter/views/sma_cos_analysis/close/view.rs @@ -1,16 +1,15 @@ -use rayon::prelude::*; - -use crate::domain::models::macos::model::AnalysisPattern; -use crate::domain::models::macos_analysis::close::model; +use crate::domain::models::crossover_strategy::analysis_pattern::model::AnalysisPattern; +use crate::domain::models::crossover_strategy::sma_cos::analysis_result::close::model; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; use crate::shared::custom_serde::naive_date::SLASH_DELIMITED_DATE_FORMAT; +use rayon::prelude::*; -pub trait MACOSAnalysisCloses { +pub trait SmaCosAnalysis { fn table_chart_header(&self) -> Vec>; fn table_chart_rows(&self, pattern: &CrossoverPatternFilter) -> Vec>; } -impl MACOSAnalysisCloses for model::MACOSAnalysisCloses { +impl SmaCosAnalysis for model::AnalysisResults { fn table_chart_header(&self) -> Vec> { vec![vec![ "date".to_string(), @@ -24,23 +23,23 @@ impl MACOSAnalysisCloses for model::MACOSAnalysisCloses { fn table_chart_rows(&self, pattern: &CrossoverPatternFilter) -> Vec> { self.par_iter() - .filter(|macos_analysis_close| pattern.matches_filter(&macos_analysis_close.pattern)) - .map(|macos_analysis_close| { - let chance_loss = match macos_analysis_close.analysis_pattern { + .filter(|analysis_result| pattern.matches_filter(&analysis_result.pattern)) + .map(|analysis_result| { + let chance_loss = match analysis_result.analysis_pattern { AnalysisPattern::None => "❔".to_string(), AnalysisPattern::GoldenChance => "✅".to_string(), AnalysisPattern::DeadChance => "✅".to_string(), AnalysisPattern::GoldenLoss => "❌".to_string(), AnalysisPattern::DeadLoss => "❌".to_string(), }; - let date_of_event = macos_analysis_close + let date_of_event = analysis_result .date_of_event .format(SLASH_DELIMITED_DATE_FORMAT) .to_string(); - let pattern = macos_analysis_close.pattern.to_string(); - let rate_of_change = format!("{:+.3}%", macos_analysis_close.rate_of_change); - let close = macos_analysis_close.close.to_string(); - let close_after_n_days = macos_analysis_close.close_after_n_days.to_string(); + let pattern = analysis_result.pattern.to_string(); + let rate_of_change = format!("{:+.3}%", analysis_result.rate_of_change); + let close = analysis_result.close.to_string(); + let close_after_n_days = analysis_result.close_after_n_days.to_string(); vec![ date_of_event, chance_loss, diff --git a/src/presenter/views/sma_cos_analysis/view.rs b/src/presenter/views/sma_cos_analysis/view.rs new file mode 100644 index 0000000..c1c1ec5 --- /dev/null +++ b/src/presenter/views/sma_cos_analysis/view.rs @@ -0,0 +1,84 @@ +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; +use crate::domain::models::crossover_strategy::latest_chance::model::LatestChance; +use crate::domain::models::crossover_strategy::rate_of_chance::model::RateOfChance; +use crate::domain::models::crossover_strategy::sma_cos::model; +use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; +use crate::shared::custom_serde::naive_date; +use charts_rs::NIL_VALUE; +use chrono::NaiveDate; +use rayon::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, PartialOrd, Default)] +pub struct SmaCosAnalysis { + pub crossover_pattern: CrossoverPattern, + #[serde(with = "naive_date::primitive")] + pub latest_chance: NaiveDate, + pub rate_of_chance: f64, +} + +impl From<(&CrossoverPatternFilter, &RateOfChance, &LatestChance)> for SmaCosAnalysis { + fn from(value: (&CrossoverPatternFilter, &RateOfChance, &LatestChance)) -> Self { + let (crossover_pattern_filter, rate_of_chance, latest_chance) = value; + let latest_chance = crossover_pattern_filter.get_latest_chance(latest_chance); + let crossover_pattern = CrossoverPattern::from(latest_chance); + let latest_chance = NaiveDate::from(latest_chance); + let rate_of_chance = crossover_pattern_filter.get_rate_of_chance(rate_of_chance); + Self { + crossover_pattern, + latest_chance, + rate_of_chance, + } + } +} + +pub trait SmaCoses { + fn sma_25_closes(&self, filter_pattern: CrossoverPattern) -> Vec; + fn sma_25_volumes(&self, filter_pattern: CrossoverPattern) -> Vec; +} + +impl SmaCoses for model::SmaCoses { + fn sma_25_closes(&self, filter_pattern: CrossoverPattern) -> Vec { + collect_filtered_sma_values(self, filter_pattern, |sma_cos| { + ( + sma_cos.crossover_pattern_close.0, + sma_cos.close_25.map(|c| c.0), + ) + }) + } + + fn sma_25_volumes(&self, filter_pattern: CrossoverPattern) -> Vec { + collect_filtered_sma_values(self, filter_pattern, |sma_cos| { + ( + sma_cos.crossover_pattern_volume.0, + sma_cos.volume_25.map(|v| v.0), + ) + }) + } +} + +fn collect_filtered_sma_values( + sma_coses: &model::SmaCoses, + filter_pattern: CrossoverPattern, + extract: impl Fn(&model::SmaCos) -> (CrossoverPattern, Option) + Sync, +) -> Vec { + sma_coses + .par_iter() + .map(|sma_cos| { + let (crossover_pattern, value) = extract(sma_cos); + value_if_patterns_match(&crossover_pattern, &filter_pattern, value) + }) + .collect() +} + +fn value_if_patterns_match( + lhs: &CrossoverPattern, + rhs: &CrossoverPattern, + value: Option, +) -> f32 { + if lhs.eq(rhs) { + value.map_or(NIL_VALUE, |value| value as _) + } else { + NIL_VALUE + } +} diff --git a/src/presenter/views/macos_analysis/volume.rs b/src/presenter/views/sma_cos_analysis/volume.rs similarity index 100% rename from src/presenter/views/macos_analysis/volume.rs rename to src/presenter/views/sma_cos_analysis/volume.rs diff --git a/src/presenter/views/macos_analysis/volume/view.rs b/src/presenter/views/sma_cos_analysis/volume/view.rs similarity index 78% rename from src/presenter/views/macos_analysis/volume/view.rs rename to src/presenter/views/sma_cos_analysis/volume/view.rs index 3173b61..1868931 100644 --- a/src/presenter/views/macos_analysis/volume/view.rs +++ b/src/presenter/views/sma_cos_analysis/volume/view.rs @@ -1,15 +1,14 @@ -use rayon::prelude::*; - -use crate::domain::models::macos_analysis::volume::model; +use crate::domain::models::crossover_strategy::sma_cos::analysis_result::volume::model; use crate::presenter::views::shared::crossover_pattern_filter::CrossoverPatternFilter; use crate::shared::custom_serde::naive_date::SLASH_DELIMITED_DATE_FORMAT; +use rayon::prelude::*; -pub trait MACOSTrendAnalysisVolumes { +pub trait SmaCosAnalysis { fn table_chart_header(&self) -> Vec>; fn table_chart_rows(&self, pattern: &CrossoverPatternFilter) -> Vec>; } -impl MACOSTrendAnalysisVolumes for model::MACOSAnalysisVolumes { +impl SmaCosAnalysis for model::AnalysisResults { fn table_chart_header(&self) -> Vec> { vec![vec![ "date".to_string(), @@ -27,8 +26,8 @@ impl MACOSTrendAnalysisVolumes for model::MACOSAnalysisVolumes { .format(SLASH_DELIMITED_DATE_FORMAT) .to_string(); let pattern = trend_analysis.pattern.to_string(); - let volume_on_macos = trend_analysis.volume.to_string(); - vec![date, pattern, volume_on_macos] + let sma_cos_volume = trend_analysis.volume.to_string(); + vec![date, pattern, sma_cos_volume] }) .collect() } diff --git a/src/presenter/views/macps_analysis.rs b/src/presenter/views/sma_cps_analysis.rs similarity index 100% rename from src/presenter/views/macps_analysis.rs rename to src/presenter/views/sma_cps_analysis.rs diff --git a/src/presenter/views/macps_analysis/view.rs b/src/presenter/views/sma_cps_analysis/view.rs similarity index 92% rename from src/presenter/views/macps_analysis/view.rs rename to src/presenter/views/sma_cps_analysis/view.rs index 4c2eb4f..e005fb2 100644 --- a/src/presenter/views/macps_analysis/view.rs +++ b/src/presenter/views/sma_cps_analysis/view.rs @@ -5,7 +5,7 @@ use crate::domain::models::buy_sell_signal::model::BuySellSignalType; use crate::shared::custom_serde::naive_date; #[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, PartialOrd, Default)] -pub struct MACPSAnalysis { +pub struct SmaCpsAnalysis { pub r#type: BuySellSignalType, #[serde(with = "naive_date::primitive")] pub date: NaiveDate, diff --git a/src/presenter/views/stock/view.rs b/src/presenter/views/stock/view.rs index d81490a..6076108 100644 --- a/src/presenter/views/stock/view.rs +++ b/src/presenter/views/stock/view.rs @@ -4,7 +4,7 @@ use crate::domain::models::stock::model; pub trait Stocks { fn formatted_dates(&self, date_format: &str) -> Vec; - fn ohlces(&self) -> Vec; + fn ohlcs(&self) -> Vec; fn volumes(&self) -> Vec; } @@ -15,7 +15,7 @@ impl Stocks for model::Stocks { .collect() } - fn ohlces(&self) -> Vec { + fn ohlcs(&self) -> Vec { self.par_iter() .flat_map(|stock| vec![stock.open, stock.close, stock.low, stock.high]) .collect() diff --git a/src/presenter/views/trend_analysis_summary/chart/view.rs b/src/presenter/views/trend_analysis_summary/chart/view.rs index d22ed71..d911717 100644 --- a/src/presenter/views/trend_analysis_summary/chart/view.rs +++ b/src/presenter/views/trend_analysis_summary/chart/view.rs @@ -3,7 +3,7 @@ use deref_derive::Deref; use rayon::prelude::*; use crate::domain::models::company::model::Company; -use crate::domain::models::macos::model::Pattern; +use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; use crate::presenter::presenters::trend_analysis::response; pub struct ChartRow(pub Vec); @@ -22,14 +22,14 @@ impl TryFrom<&response::TrendAnalysis> for ChartRow { } => { let Company { code, symbol, .. } = company; let latest_chance = crossover_pattern_filter.get_latest_chance(latest_chance); - let macos = Pattern::from(latest_chance).to_string(); + let crossover_pattern = CrossoverPattern::from(latest_chance).to_string(); let latest_chance = latest_chance.to_string(); let rate_of_chance_percent = crossover_pattern_filter.format_rate_of_chance_percent(rate_of_chance); Ok(ChartRow(vec![ code.to_string(), symbol.to_string(), - macos, + crossover_pattern, latest_chance, rate_of_chance_percent, ])) diff --git a/src/presenter/views/trend_analysis_summary/json/view.rs b/src/presenter/views/trend_analysis_summary/json/view.rs index 5c98e76..c9b5960 100644 --- a/src/presenter/views/trend_analysis_summary/json/view.rs +++ b/src/presenter/views/trend_analysis_summary/json/view.rs @@ -4,16 +4,16 @@ use rayon::prelude::*; use serde::{Deserialize, Serialize}; use crate::presenter::presenters::trend_analysis::response; -use crate::presenter::views::buy_sell_signal_analysis::view::BuySellSignalAnalysis; -use crate::presenter::views::macos_analysis::view::MACOSAnalysis; +use crate::presenter::views::high_low_direction_signal_analysis::view::HighLowDirectionSignalAnalysis; +use crate::presenter::views::sma_cos_analysis::view::SmaCosAnalysis; use crate::presenter::views::trend_reversal_analysis::view::TrendReversalAnalysis; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, PartialOrd, Default)] pub struct JsonRow { pub code: String, pub symbol: String, - pub macos_analysis: MACOSAnalysis, - pub ecp1_analysis: BuySellSignalAnalysis, + pub sma_cos_analysis: SmaCosAnalysis, + pub high_low_direction_signal_analysis: HighLowDirectionSignalAnalysis, pub trend_reversal_analysis: TrendReversalAnalysis, } @@ -27,18 +27,19 @@ impl TryFrom<&response::TrendAnalysis> for JsonRow { crossover_pattern_filter, rate_of_chance, latest_chance, - ecp1s, + high_low_direction_signals, trend_reversal_analysis, } => { - let macos_analysis = - MACOSAnalysis::from((crossover_pattern_filter, rate_of_chance, latest_chance)); - let ecp1_analysis = BuySellSignalAnalysis::from(ecp1s.as_slice()); + let sma_cos_analysis = + SmaCosAnalysis::from((crossover_pattern_filter, rate_of_chance, latest_chance)); + let high_low_direction_signal_analysis = + HighLowDirectionSignalAnalysis::from(high_low_direction_signals.as_slice()); let trend_reversal_analysis = TrendReversalAnalysis::from(trend_reversal_analysis); Ok(JsonRow { code: company.code.to_string(), symbol: company.symbol.to_string(), - macos_analysis, - ecp1_analysis, + sma_cos_analysis, + high_low_direction_signal_analysis, trend_reversal_analysis, }) } @@ -68,16 +69,15 @@ impl From for JSON { #[cfg(test)] mod tests { - use chrono::NaiveDate; - use indoc::indoc; - use crate::domain::models::buy_sell_signal::model::BuySellSignal; use crate::domain::models::buy_sell_signal::model::BuySellSignalType; - use crate::domain::models::macos::model::Pattern; - use crate::presenter::views::buy_sell_signal_analysis::view::BuySellSignalAnalysis; - use crate::presenter::views::macos_analysis::view::MACOSAnalysis; + use crate::domain::models::crossover_strategy::crossover_pattern::model::CrossoverPattern; + use crate::presenter::views::high_low_direction_signal_analysis::view::HighLowDirectionSignalAnalysis; + use crate::presenter::views::sma_cos_analysis::view::SmaCosAnalysis; use crate::presenter::views::trend_analysis_summary::json::view::JsonRow; use crate::presenter::views::trend_reversal_analysis::view::TrendReversalAnalysis; + use chrono::NaiveDate; + use indoc::indoc; #[test] fn serde_test() { @@ -85,12 +85,12 @@ mod tests { { "code": "8473", "symbol": "8473.T", - "macos_analysis": { - "pattern": "Neither", + "sma_cos_analysis": { + "crossover_pattern": "Neither", "latest_chance": "2017-02-16", "rate_of_chance": 32.7 }, - "ecp1_analysis": [ + "high_low_direction_signal_analysis": [ { "type": "Stay", "date": "2017-02-16" @@ -98,18 +98,19 @@ mod tests { ], "trend_reversal_analysis": { "type": "Buy", - "macos_date": "2023-08-15", - "ecp2_date": "2023-06-01", - "msesp_date": "2023-07-26", - "macps_date": "2023-07-04" + "sma_cos_date": "2023-08-15", + "sma_cps_date": "2023-07-04", + "body_engulfing_date": "2023-06-01", + "ms_es_date": "2023-07-26", + "macd_cos_date": "2023-08-15" } }"#}; - let macos_analysis = MACOSAnalysis { - pattern: Pattern::Neither, + let sma_cos_analysis = SmaCosAnalysis { + crossover_pattern: CrossoverPattern::Neither, latest_chance: NaiveDate::from_ymd_opt(2017, 2, 16).unwrap(), rate_of_chance: 32.7, }; - let ecp1_analysis = BuySellSignalAnalysis::from( + let high_low_direction_signal_analysis = HighLowDirectionSignalAnalysis::from( [BuySellSignal { r#type: BuySellSignalType::Stay, date: NaiveDate::from_ymd_opt(2017, 2, 16).unwrap(), @@ -118,16 +119,17 @@ mod tests { ); let trend_reversal_analysis = TrendReversalAnalysis { r#type: BuySellSignalType::Buy, - macos_date: NaiveDate::from_ymd_opt(2023, 8, 15).unwrap(), - ecp2_date: NaiveDate::from_ymd_opt(2023, 6, 1).unwrap(), - msesp_date: NaiveDate::from_ymd_opt(2023, 7, 26).unwrap(), - macps_date: NaiveDate::from_ymd_opt(2023, 7, 4).unwrap(), + sma_cos_date: NaiveDate::from_ymd_opt(2023, 8, 15).unwrap(), + sma_cps_date: NaiveDate::from_ymd_opt(2023, 7, 4).unwrap(), + body_engulfing_date: NaiveDate::from_ymd_opt(2023, 6, 1).unwrap(), + ms_es_date: NaiveDate::from_ymd_opt(2023, 7, 26).unwrap(), + macd_cos_date: NaiveDate::from_ymd_opt(2023, 8, 15).unwrap(), }; let json_row = JsonRow { code: "8473".to_string(), symbol: "8473.T".to_string(), - macos_analysis, - ecp1_analysis, + sma_cos_analysis, + high_low_direction_signal_analysis, trend_reversal_analysis, }; let actual = serde_json::to_string_pretty(&json_row).unwrap(); diff --git a/src/presenter/views/trend_reversal_analysis/view.rs b/src/presenter/views/trend_reversal_analysis/view.rs index 196d213..c6de49f 100644 --- a/src/presenter/views/trend_reversal_analysis/view.rs +++ b/src/presenter/views/trend_reversal_analysis/view.rs @@ -1,38 +1,49 @@ -use chrono::NaiveDate; -use serde::{Deserialize, Serialize}; - use crate::domain::models::buy_sell_signal::model::BuySellSignalType; use crate::domain::models::trend_reversal_analysis::model; use crate::shared::custom_serde::naive_date; +use chrono::NaiveDate; +use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, PartialOrd, Default)] pub struct TrendReversalAnalysis { pub r#type: BuySellSignalType, #[serde(with = "naive_date::primitive")] - pub macos_date: NaiveDate, + pub sma_cos_date: NaiveDate, + #[serde(with = "naive_date::primitive")] + pub sma_cps_date: NaiveDate, #[serde(with = "naive_date::primitive")] - pub ecp2_date: NaiveDate, + pub body_engulfing_date: NaiveDate, #[serde(with = "naive_date::primitive")] - pub msesp_date: NaiveDate, + pub ms_es_date: NaiveDate, #[serde(with = "naive_date::primitive")] - pub macps_date: NaiveDate, + pub macd_cos_date: NaiveDate, } impl From<&model::TrendReversalAnalysis> for TrendReversalAnalysis { fn from(value: &model::TrendReversalAnalysis) -> Self { let model::TrendReversalAnalysis { r#type, - macos, - ecp2, - msesp, - macps, + sma_cos, + body_engulfing, + ms_es, + sma_cps, + macd_cos, } = value; Self { r#type: *r#type, - macos_date: macos.map(|(date, _)| date).unwrap_or(NaiveDate::default()), - ecp2_date: ecp2.map(|(date, _)| date).unwrap_or(NaiveDate::default()), - msesp_date: msesp.map(|(date, _)| date).unwrap_or(NaiveDate::default()), - macps_date: macps.map(|(date, _)| date).unwrap_or(NaiveDate::default()), + sma_cos_date: sma_cos + .map(|(date, _)| date) + .unwrap_or(NaiveDate::default()), + sma_cps_date: sma_cps + .map(|(date, _)| date) + .unwrap_or(NaiveDate::default()), + body_engulfing_date: body_engulfing + .map(|(date, _)| date) + .unwrap_or(NaiveDate::default()), + ms_es_date: ms_es.map(|(date, _)| date).unwrap_or(NaiveDate::default()), + macd_cos_date: macd_cos + .map(|(date, _)| date) + .unwrap_or(NaiveDate::default()), } } } diff --git a/src/shared/jquants_api/setup.rs b/src/shared/jquants_api/setup.rs index d468555..3da5578 100644 --- a/src/shared/jquants_api/setup.rs +++ b/src/shared/jquants_api/setup.rs @@ -4,7 +4,7 @@ use bytestring::ByteString; pub struct Setup {} impl Setup { - pub async fn run() -> Result { + pub fn run() -> Result { let api_key = std::env::var("JQUANTS_API_KEY") .with_context(|| "JQUANTS_API_KEY MUST be set up for JQUANTS".to_string())?; Ok(ByteString::from(api_key)) diff --git a/src/use_case/interactors/trend_analysis/interactor.rs b/src/use_case/interactors/trend_analysis/interactor.rs index 222bd30..7b0ebc8 100644 --- a/src/use_case/interactors/trend_analysis/interactor.rs +++ b/src/use_case/interactors/trend_analysis/interactor.rs @@ -1,16 +1,14 @@ -use anyhow::Result; -use async_trait::async_trait; - +use crate::domain::models::body_engulfing::model::BodyEngulfings; use crate::domain::models::candle_stick::model::CandleSticks; -use crate::domain::models::ecp1::model::ECP1s; -use crate::domain::models::ecp2::model::ECP2s; -use crate::domain::models::macos::model::MACOSes; -use crate::domain::models::macos_analysis::close::model::MACOSAnalysisCloses; -use crate::domain::models::macos_analysis::volume::model::MACOSAnalysisVolumes; -use crate::domain::models::macps::model::MACPS; -use crate::domain::models::msesp::model::MSESPes; +use crate::domain::models::crossover_strategy::macd_cos::model::MacdCoses; +use crate::domain::models::crossover_strategy::sma_cos::analysis_result; +use crate::domain::models::crossover_strategy::sma_cos::model::SmaCoses; +use crate::domain::models::crossover_strategy::sma_cps::model::SmaCps; +use crate::domain::models::high_low_direction_signal::model::HighLowDirectionSignals; +use crate::domain::models::macd::model::MACDs; +use crate::domain::models::ms_es::model::MsEses; use crate::domain::models::sma::model::{SMAListPair, SMAListTrio, SMAs}; -use crate::domain::models::stocks_macoses_pair::model::StocksMACOSESPair; +use crate::domain::models::stocks_sma_coses_pair::model::StocksSmaCosesPair; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysis; use crate::domain::models::trend_reversal_analysis::model::TrendReversalAnalysisSet; use crate::domain::repositories; @@ -20,6 +18,8 @@ use crate::presenter::presenters::trend_analysis::output; use crate::shared::iterator::{FromEnd, SliceWrapper}; use crate::use_case::interfaces::trend_analysis::input; use crate::use_case::interfaces::trend_analysis::use_case; +use anyhow::Result; +use async_trait::async_trait; #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)] pub struct TrendAnalysis<'a, SR, CR> { @@ -48,6 +48,9 @@ where const MARUBOZU_BODY_MIN_RATIO: usize, const MARUBOZU_WICK_MAX_RATIO: usize, const DOJI_MAX_BODY_RATIO: usize, + const FAST_PERIOD: usize, + const SLOW_PERIOD: usize, + const SIGNAL_PERIOD: usize, >( &self, input: input::TrendAnalysis, @@ -79,7 +82,7 @@ where smas_n: smas_5.as_slice(), smas_o: smas_25.as_slice(), }; - let macoses = MACOSes::from(sma_list_pair); + let sma_coses = SmaCoses::from(sma_list_pair); let smas_50 = SMAs::<50>::from(stocks.as_slice()); let sma_list_trio = SMAListTrio { @@ -87,21 +90,28 @@ where smas_o: smas_25.as_slice(), smas_p: smas_50.as_slice(), }; - let macps = MACPS::from((stocks.as_slice(), sma_list_trio)); + let sma_cps = SmaCps::from((stocks.as_slice(), sma_list_trio)); let stocks_from_end_days = SliceWrapper::from(stocks.as_slice()).get_from_end(FROM_END_DAYS); - let ecp1s = ECP1s::from(stocks_from_end_days.as_slice()); + let high_low_direction_signals = + HighLowDirectionSignals::from(stocks_from_end_days.as_slice()); - let stocks_macoses_pair = StocksMACOSESPair { + let stocks_sma_coses_pair = StocksSmaCosesPair { stocks: stocks.as_slice(), - macoses: macoses.as_slice(), + sma_coses: sma_coses.as_slice(), }; - let macos_analysis_closes = MACOSAnalysisCloses::::from(&stocks_macoses_pair); - let rate_of_chance = macos_analysis_closes.rate_of_chance(); - let latest_chance = macos_analysis_closes.latest_chance(); + let sma_cos_analysis_result_closes = analysis_result::close::model::AnalysisResults::< + AFTER_DAYS, + >::from(&stocks_sma_coses_pair); + let rate_of_chance = sma_cos_analysis_result_closes.rate_of_chance(); + let latest_chance = sma_cos_analysis_result_closes.latest_chance(); + + let sma_cos_analysis_result_volumes = + analysis_result::volume::model::AnalysisResults::from(&stocks_sma_coses_pair); - let macos_analysis_volumes = MACOSAnalysisVolumes::from(&stocks_macoses_pair); + let macds = MACDs::::from(stocks.as_slice()); + let macd_coses = MacdCoses::from(macds); let candle_sticks = CandleSticks::< MARUBOZU_BODY_MIN_RATIO, @@ -110,29 +120,31 @@ where >::try_from(stocks.as_slice())?; let candle_sticks_from_end_days = SliceWrapper::from(candle_sticks.as_slice()).get_from_end(FROM_END_DAYS); - let ecp2s = ECP2s::from(candle_sticks_from_end_days.as_slice()); - let msespes = MSESPes::from(candle_sticks_from_end_days.as_slice()); + let body_engulfings = BodyEngulfings::from(candle_sticks_from_end_days.as_slice()); + let ms_eses = MsEses::from(candle_sticks_from_end_days.as_slice()); // 相場転換を分析 let trend_reversal_analysis_set = TrendReversalAnalysisSet { - ecp2s: &ecp2s, - msesps: &msespes, - macps: &macps, - macoses: &macoses, + body_engulfings: &body_engulfings, + ms_eses: &ms_eses, + sma_cps: &sma_cps, + sma_coses: &sma_coses, + macd_coses: &macd_coses, }; let trend_reversal_analysis = TrendReversalAnalysis::from(trend_reversal_analysis_set); + // TODO: MacdCosesを追加 let output = output::TrendAnalysis { company, stocks, smas_5, smas_25, smas_50, - macoses, - macos_analysis_closes, + sma_coses, + sma_cos_analysis_result_closes, rate_of_chance, latest_chance, - macos_analysis_volumes, - ecp1s, + sma_cos_analysis_result_volumes, + high_low_direction_signals, candle_sticks, trend_reversal_analysis, crossover_pattern_filter: input.crossover_pattern_filter, diff --git a/src/use_case/interfaces/trend_analysis/use_case.rs b/src/use_case/interfaces/trend_analysis/use_case.rs index bd96561..ced6847 100644 --- a/src/use_case/interfaces/trend_analysis/use_case.rs +++ b/src/use_case/interfaces/trend_analysis/use_case.rs @@ -12,6 +12,9 @@ pub trait TrendAnalysis { const MARUBOZU_BODY_MIN_RATIO: usize, const MARUBOZU_WICK_MAX_RATIO: usize, const DOJI_MAX_BODY_RATIO: usize, + const FAST_PERIOD: usize, + const SLOW_PERIOD: usize, + const SIGNAL_PERIOD: usize, >( &self, input: input::TrendAnalysis, diff --git a/tests/csv.rs b/tests/csv.rs index b5c91ca..443770b 100644 --- a/tests/csv.rs +++ b/tests/csv.rs @@ -2,7 +2,7 @@ use anyhow::Context; use csv::{ReaderBuilder, Writer}; use indoc::indoc; use quantitative_data_analysis_rs::infrastructure::repositories::stock::structures::internal::csv::Structure; -use quantitative_data_analysis_rs::presenter::views::macos_analysis::view::MACOSAnalysis; +use quantitative_data_analysis_rs::presenter::views::sma_cos_analysis::view::SmaCosAnalysis; const CSV_8473: &[u8] = include_bytes!("../assets/8473.T.csv"); @@ -37,16 +37,16 @@ fn csv_sandbox() { assert_eq!(actual, expected); let json = indoc! {r#"{ - "pattern":"GoldenCross", + "crossover_pattern":"GoldenCross", "latest_chance":"2023-08-30", "rate_of_chance":27.27272727272727 }"#}; - let macos_analysis: MACOSAnalysis = serde_json::from_str(json).unwrap(); + let sma_cos_analysis: SmaCosAnalysis = serde_json::from_str(json).unwrap(); let mut builder = Writer::from_writer(vec![]); - let _ = builder.serialize(macos_analysis); + let _ = builder.serialize(sma_cos_analysis); let data = String::from_utf8(builder.into_inner().unwrap()).unwrap(); assert_eq!( data, - "pattern,latest_chance,rate_of_chance\nGoldenCross,2023-08-30,27.27272727272727\n" + "crossover_pattern,latest_chance,rate_of_chance\nGoldenCross,2023-08-30,27.27272727272727\n" ); } diff --git a/tests/simple_moving_average.rs b/tests/simple_moving_average.rs deleted file mode 100644 index 9e1cf23..0000000 --- a/tests/simple_moving_average.rs +++ /dev/null @@ -1,15 +0,0 @@ -use anyhow::Result; -use simple_moving_average::{SMA, SumTreeSMA}; - -#[test] -fn simple_moving_average_sandbox() -> Result<()> { - let mut ma = SumTreeSMA::<_, f32, 5>::new(); // Sample window size = 2 - ma.add_sample(100.0); - ma.add_sample(200.0); - ma.add_sample(300.0); - ma.add_sample(400.0); - ma.add_sample(500.0); - let expected = 300.0; - assert_eq!(ma.get_average(), expected); - Ok(()) -}