Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f2258f208 | |||
| 32a34fadd6 | |||
| 4edc70c4c6 | |||
| 9804851133 | |||
| 6ffa0346aa | |||
| 29eafc79e2 | |||
| b6859a3360 | |||
| a00dea58b2 | |||
| 2445dc925a | |||
| 1e8d38f2ee | |||
| d2071e4311 | |||
| 0fba16342f | |||
| bd389de57f | |||
| bfbf898027 | |||
| 2b6d031a55 | |||
| 6160a74d2a | |||
| 4acecda79d | |||
| d847cb5c28 | |||
| fa0b316a8b | |||
| 21786187c9 | |||
| e0bed38184 | |||
| c0b78846d6 | |||
| 9d72567b99 | |||
| e47228beff | |||
| 1fc8a3a9e6 | |||
| 98199c02a2 | |||
| 6eaa06c1d6 | |||
| 7e0877b586 | |||
| 36833b7a6a | |||
| 4c0157b66c | |||
| f7d16fb664 | |||
| 97cdfa5972 |
Generated
+314
-8
@@ -2,6 +2,17 @@
|
|||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 4
|
version = 4
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ahash"
|
||||||
|
version = "0.7.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.2.17",
|
||||||
|
"once_cell",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ahash"
|
name = "ahash"
|
||||||
version = "0.8.12"
|
version = "0.8.12"
|
||||||
@@ -25,6 +36,12 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "arrayvec"
|
||||||
|
version = "0.7.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "atomic-waker"
|
name = "atomic-waker"
|
||||||
version = "1.1.2"
|
version = "1.1.2"
|
||||||
@@ -49,6 +66,18 @@ version = "2.11.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitvec"
|
||||||
|
version = "1.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
|
||||||
|
dependencies = [
|
||||||
|
"funty",
|
||||||
|
"radium",
|
||||||
|
"tap",
|
||||||
|
"wyz",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "block-buffer"
|
name = "block-buffer"
|
||||||
version = "0.10.4"
|
version = "0.10.4"
|
||||||
@@ -58,12 +87,58 @@ dependencies = [
|
|||||||
"generic-array",
|
"generic-array",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "borsh"
|
||||||
|
version = "1.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
|
||||||
|
dependencies = [
|
||||||
|
"borsh-derive",
|
||||||
|
"bytes",
|
||||||
|
"cfg_aliases",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "borsh-derive"
|
||||||
|
version = "1.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
|
||||||
|
dependencies = [
|
||||||
|
"once_cell",
|
||||||
|
"proc-macro-crate",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 3.0.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.20.2"
|
version = "3.20.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bytecheck"
|
||||||
|
version = "0.6.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
|
||||||
|
dependencies = [
|
||||||
|
"bytecheck_derive",
|
||||||
|
"ptr_meta",
|
||||||
|
"simdutf8",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bytecheck_derive"
|
||||||
|
version = "0.6.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.12.1"
|
version = "1.12.1"
|
||||||
@@ -100,7 +175,7 @@ checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cpufeatures 0.3.1",
|
"cpufeatures 0.3.1",
|
||||||
"rand_core",
|
"rand_core 0.10.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -239,11 +314,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
|||||||
name = "fidc-core"
|
name = "fidc-core"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash 0.8.12",
|
||||||
"chrono",
|
"chrono",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"rayon",
|
"rayon",
|
||||||
"rhai",
|
"rhai",
|
||||||
|
"rust_decimal",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2",
|
"sha2",
|
||||||
@@ -275,6 +351,12 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "funty"
|
||||||
|
version = "2.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-channel"
|
name = "futures-channel"
|
||||||
version = "0.3.34"
|
version = "0.3.34"
|
||||||
@@ -353,10 +435,19 @@ dependencies = [
|
|||||||
"js-sys",
|
"js-sys",
|
||||||
"libc",
|
"libc",
|
||||||
"r-efi 6.0.0",
|
"r-efi 6.0.0",
|
||||||
"rand_core",
|
"rand_core 0.10.1",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hashbrown"
|
||||||
|
version = "0.12.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||||
|
dependencies = [
|
||||||
|
"ahash 0.7.8",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
version = "0.16.1"
|
version = "0.16.1"
|
||||||
@@ -596,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
|
checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"equivalent",
|
"equivalent",
|
||||||
"hashbrown",
|
"hashbrown 0.16.1",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_core",
|
"serde_core",
|
||||||
]
|
]
|
||||||
@@ -729,6 +820,24 @@ dependencies = [
|
|||||||
"zerovec",
|
"zerovec",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.21"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
||||||
|
dependencies = [
|
||||||
|
"zerocopy",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[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]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.106"
|
version = "1.0.106"
|
||||||
@@ -738,6 +847,26 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ptr_meta"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
|
||||||
|
dependencies = [
|
||||||
|
"ptr_meta_derive",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ptr_meta_derive"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quinn"
|
name = "quinn"
|
||||||
version = "0.11.11"
|
version = "0.11.11"
|
||||||
@@ -767,7 +896,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"lru-slab",
|
"lru-slab",
|
||||||
"rand",
|
"rand 0.10.2",
|
||||||
"rand_pcg",
|
"rand_pcg",
|
||||||
"ring",
|
"ring",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
@@ -815,6 +944,23 @@ version = "6.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
|
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "radium"
|
||||||
|
version = "0.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.8.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"rand_chacha",
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.10.2"
|
version = "0.10.2"
|
||||||
@@ -823,7 +969,26 @@ checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"chacha20",
|
"chacha20",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"rand_core",
|
"rand_core 0.10.1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86",
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.2.17",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -838,7 +1003,7 @@ version = "0.10.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
|
checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rand_core",
|
"rand_core 0.10.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -861,6 +1026,15 @@ dependencies = [
|
|||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rend"
|
||||||
|
version = "0.4.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
|
||||||
|
dependencies = [
|
||||||
|
"bytecheck",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reqwest"
|
name = "reqwest"
|
||||||
version = "0.12.24"
|
version = "0.12.24"
|
||||||
@@ -905,7 +1079,7 @@ version = "1.23.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f4e35aaaa439a5bda2f8d15251bc375e4edfac75f9865734644782c9701b5709"
|
checksum = "f4e35aaaa439a5bda2f8d15251bc375e4edfac75f9865734644782c9701b5709"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash 0.8.12",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"instant",
|
"instant",
|
||||||
"no-std-compat",
|
"no-std-compat",
|
||||||
@@ -942,6 +1116,51 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rkyv"
|
||||||
|
version = "0.7.46"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1"
|
||||||
|
dependencies = [
|
||||||
|
"bitvec",
|
||||||
|
"bytecheck",
|
||||||
|
"bytes",
|
||||||
|
"hashbrown 0.12.3",
|
||||||
|
"ptr_meta",
|
||||||
|
"rend",
|
||||||
|
"rkyv_derive",
|
||||||
|
"seahash",
|
||||||
|
"tinyvec",
|
||||||
|
"uuid",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rkyv_derive"
|
||||||
|
version = "0.7.46"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rust_decimal"
|
||||||
|
version = "1.39.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
|
||||||
|
dependencies = [
|
||||||
|
"arrayvec",
|
||||||
|
"borsh",
|
||||||
|
"bytes",
|
||||||
|
"num-traits",
|
||||||
|
"rand 0.8.8",
|
||||||
|
"rkyv",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc-hash"
|
name = "rustc-hash"
|
||||||
version = "2.1.3"
|
version = "2.1.3"
|
||||||
@@ -995,6 +1214,12 @@ version = "1.0.23"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
|
checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "seahash"
|
||||||
|
version = "4.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.228"
|
version = "1.0.228"
|
||||||
@@ -1067,6 +1292,12 @@ version = "1.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simdutf8"
|
||||||
|
version = "0.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slab"
|
name = "slab"
|
||||||
version = "0.4.12"
|
version = "0.4.12"
|
||||||
@@ -1124,6 +1355,17 @@ version = "2.6.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
version = "1.0.109"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "2.0.117"
|
version = "2.0.117"
|
||||||
@@ -1179,6 +1421,12 @@ name = "ta-lib-dispatch"
|
|||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
source = "git+https://github.com/TA-Lib/ta-lib.git?rev=dd5a90259a3f9e04e2da9f38bf0719a841b40108#dd5a90259a3f9e04e2da9f38bf0719a841b40108"
|
source = "git+https://github.com/TA-Lib/ta-lib.git?rev=dd5a90259a3f9e04e2da9f38bf0719a841b40108#dd5a90259a3f9e04e2da9f38bf0719a841b40108"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tap"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thin-vec"
|
name = "thin-vec"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
@@ -1263,6 +1511,36 @@ dependencies = [
|
|||||||
"tokio",
|
"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.6+spec-1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0db3bae107c9522f86d361697dee1d7386a2ddcf659d5aea5159819a21a3c4a7"
|
||||||
|
dependencies = [
|
||||||
|
"indexmap",
|
||||||
|
"toml_datetime",
|
||||||
|
"toml_parser",
|
||||||
|
"winnow",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "toml_parser"
|
||||||
|
version = "1.1.3+spec-1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
|
||||||
|
dependencies = [
|
||||||
|
"winnow",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower"
|
name = "tower"
|
||||||
version = "0.5.3"
|
version = "0.5.3"
|
||||||
@@ -1369,6 +1647,16 @@ version = "1.0.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
|
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "uuid"
|
||||||
|
version = "1.26.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
|
||||||
|
dependencies = [
|
||||||
|
"js-sys",
|
||||||
|
"wasm-bindgen",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version_check"
|
name = "version_check"
|
||||||
version = "0.9.5"
|
version = "0.9.5"
|
||||||
@@ -1624,6 +1912,15 @@ version = "0.52.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winnow"
|
||||||
|
version = "1.0.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
|
||||||
|
dependencies = [
|
||||||
|
"memchr",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wit-bindgen"
|
name = "wit-bindgen"
|
||||||
version = "0.57.1"
|
version = "0.57.1"
|
||||||
@@ -1636,6 +1933,15 @@ version = "0.6.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
|
checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wyz"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
|
||||||
|
dependencies = [
|
||||||
|
"tap",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yoke"
|
name = "yoke"
|
||||||
version = "0.8.3"
|
version = "0.8.3"
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ version = "0.1.0"
|
|||||||
authors = ["OpenAI Codex"]
|
authors = ["OpenAI Codex"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
rust_decimal = { version = "=1.39.0", features = ["serde-with-str"] }
|
||||||
sha2 = "=0.10.9"
|
sha2 = "=0.10.9"
|
||||||
ahash = "=0.8.12"
|
ahash = "=0.8.12"
|
||||||
chrono = { version = "=0.4.44", features = ["serde"] }
|
chrono = { version = "=0.4.44", features = ["serde"] }
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
<p><img src="assets/brand/fiPandaWithTitle.png" alt="FiPanda" width="144" height="144"></p>
|
||||||
|
|
||||||
# fidc-backtest-engine
|
# fidc-backtest-engine
|
||||||
|
|
||||||
面向中国 A 股和期货策略的 Rust 回测核心。仓库目标是提供平台自有的策略 DSL、执行模型、撮合模型和结果分析能力,最终由 `fidc-backtest-service` 对外提供策略运行服务。
|
面向中国 A 股和期货策略的 Rust 回测核心。仓库目标是提供平台自有的策略 DSL、执行模型、撮合模型和结果分析能力,最终由 `fidc-backtest-service` 对外提供策略运行服务。
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# FiPanda 品牌资源
|
||||||
|
|
||||||
|
FIDC 系列共用用户提供的两张原始透明图片,不重绘、不裁切、不染色。
|
||||||
|
|
||||||
|
- `fiPandaWithTitle.png`:带标题版,登录页、项目首页、独立报告使用。
|
||||||
|
- `fipanda.png`:无标题版,顶部导航、小尺寸标识和系统图标使用。
|
||||||
|
- `favicon-32.png`:由无标题版等比生成,供浏览器标签页使用。
|
||||||
|
|
||||||
|
导航图标建议 28–42px;带标题版建议 96–160px。始终等比完整显示,保留透明背景,不为 Logo 增加大块容器或改变业务页面主题。项目名称、权限、交易合同与内部 FIDC 标识不因品牌图片变更而重命名。
|
||||||
|
|
||||||
|
原图保存在 `omniquant/assets/brand/source/`;`manifest.json` 记录原图和显示资源的 SHA-256。需要更新时,在完整工作区运行 `node omniquant/scripts/sync-fipanda-branding.mjs`,统一生成八个仓库及可下载策略技能包的资源,禁止分别维护不同版本。
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 307 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 78 KiB |
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
"schema": "fidc.fipanda-brand/v1",
|
||||||
|
"brand": "FiPanda",
|
||||||
|
"sourceRepository": "omniquant",
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"file": "fipanda.png",
|
||||||
|
"sha256": "ff7dc0677b7d9c8dc6d008d3391f27fd583e3de35560dab021c1e2f8f2c464e5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "fiPandaWithTitle.png",
|
||||||
|
"sha256": "01bfb6acb36830d9b1ce6f7dc8c718977d43af44572ee6a26991d6c6aa2847d6"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"file": "fipanda.png",
|
||||||
|
"source": "fipanda.png",
|
||||||
|
"pixels": 192,
|
||||||
|
"usage": "navigation, compact icons, apple-touch-icon",
|
||||||
|
"sha256": "450aad3506ec3c67624b7705f4d8f851a9102fe950e7671a06fb1203dc1d9cf7"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "fiPandaWithTitle.png",
|
||||||
|
"source": "fiPandaWithTitle.png",
|
||||||
|
"pixels": 384,
|
||||||
|
"usage": "login, project README, standalone reports",
|
||||||
|
"sha256": "d33846b3687ea69d43b4a1f17ceeb02662bd25f26fabc4c86c25b3475f20dede"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"file": "favicon-32.png",
|
||||||
|
"source": "fipanda.png",
|
||||||
|
"pixels": 32,
|
||||||
|
"usage": "browser tab icon",
|
||||||
|
"sha256": "ec3d7783457db284d46ae6e27833685203838637a7d68946ff85402725f8e420"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ license.workspace = true
|
|||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
rust_decimal.workspace = true
|
||||||
ahash.workspace = true
|
ahash.workspace = true
|
||||||
chrono.workspace = true
|
chrono.workspace = true
|
||||||
indexmap.workspace = true
|
indexmap.workspace = true
|
||||||
|
|||||||
+677
-219
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,480 @@
|
|||||||
|
//! Executes one frozen pool intent against real broker-simulator state.
|
||||||
|
use super::*;
|
||||||
|
use crate::holding_policy::HoldingLifecycleEvidence;
|
||||||
|
use crate::stock_pool_execution as pool;
|
||||||
|
use rust_decimal::{Decimal, prelude::ToPrimitive};
|
||||||
|
|
||||||
|
fn decimal(value: f64, label: &str) -> Result<Decimal, BacktestError> {
|
||||||
|
if !value.is_finite() {
|
||||||
|
return Err(BacktestError::Execution(format!(
|
||||||
|
"stock_pool_nonfinite_{label}"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
value
|
||||||
|
.to_string()
|
||||||
|
.parse()
|
||||||
|
.map_err(|_| BacktestError::Execution(format!("stock_pool_decimal_range_{label}")))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pool_positions(
|
||||||
|
portfolio: &PortfolioState,
|
||||||
|
date: NaiveDate,
|
||||||
|
) -> Result<Vec<pool::Position>, BacktestError> {
|
||||||
|
portfolio
|
||||||
|
.positions()
|
||||||
|
.values()
|
||||||
|
.filter(|p| p.quantity > 0)
|
||||||
|
.map(|p| {
|
||||||
|
Ok(pool::Position {
|
||||||
|
symbol: p.symbol.clone(),
|
||||||
|
quantity: Decimal::from(p.quantity),
|
||||||
|
closable_quantity: Decimal::from(p.sellable_qty(date)),
|
||||||
|
average_cost: decimal(p.average_cost, "position_cost")?,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<C: CostModel, R: EquityRuleHooks> BrokerSimulator<C, R> {
|
||||||
|
fn pool_quote_inputs(
|
||||||
|
&self,
|
||||||
|
date: NaiveDate,
|
||||||
|
data: &DataSet,
|
||||||
|
symbols: &BTreeSet<String>,
|
||||||
|
execution_clock: Option<NaiveDateTime>,
|
||||||
|
) -> Result<Vec<pool::MarketSnapshot>, BacktestError> {
|
||||||
|
symbols
|
||||||
|
.iter()
|
||||||
|
.map(|symbol| {
|
||||||
|
let snapshot = data.market(date, symbol).ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!(
|
||||||
|
"stock_pool_execution_snapshot_missing:{symbol}:{date}"
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
let instrument = data.instruments().get(symbol).ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!("stock_pool_instrument_missing:{symbol}"))
|
||||||
|
})?;
|
||||||
|
let (price, prev, volume, amount, bid, ask, buy_price, sell_price) = if self
|
||||||
|
.matching_type_uses_intraday_quotes()
|
||||||
|
{
|
||||||
|
let time = self
|
||||||
|
.runtime_intraday_start_time
|
||||||
|
.get()
|
||||||
|
.or(self.intraday_execution_start_time)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
BacktestError::Execution(
|
||||||
|
"stock_pool_intraday_execution_clock_required".into(),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let clock = execution_clock
|
||||||
|
.unwrap_or(date.and_time(time))
|
||||||
|
.max(date.and_time(time));
|
||||||
|
let quote = data
|
||||||
|
.execution_quotes_on(date, symbol)
|
||||||
|
.iter()
|
||||||
|
.rev()
|
||||||
|
.find(|quote| quote.timestamp <= clock)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!(
|
||||||
|
"stock_pool_execution_quote_missing:{symbol}:{clock}"
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
if !quote.last_price.is_finite() || quote.last_price <= 0.0 {
|
||||||
|
return Err(BacktestError::Execution(format!(
|
||||||
|
"stock_pool_execution_quote_invalid:{symbol}:{clock}"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
let raw_buy = self
|
||||||
|
.select_quote_reference_price(
|
||||||
|
snapshot,
|
||||||
|
quote,
|
||||||
|
OrderSide::Buy,
|
||||||
|
self.matching_type,
|
||||||
|
)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!(
|
||||||
|
"stock_pool_buy_reference_missing:{symbol}:{clock}"
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
let raw_sell = self
|
||||||
|
.select_quote_reference_price(
|
||||||
|
snapshot,
|
||||||
|
quote,
|
||||||
|
OrderSide::Sell,
|
||||||
|
self.matching_type,
|
||||||
|
)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!(
|
||||||
|
"stock_pool_sell_reference_missing:{symbol}:{clock}"
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
let calibration = self.slippage_calibration(data, snapshot)?;
|
||||||
|
let buy = self.quote_execution_price(
|
||||||
|
snapshot,
|
||||||
|
OrderSide::Buy,
|
||||||
|
raw_buy,
|
||||||
|
None,
|
||||||
|
calibration.as_ref(),
|
||||||
|
)?;
|
||||||
|
let sell = self.quote_execution_price(
|
||||||
|
snapshot,
|
||||||
|
OrderSide::Sell,
|
||||||
|
raw_sell,
|
||||||
|
None,
|
||||||
|
calibration.as_ref(),
|
||||||
|
)?;
|
||||||
|
(
|
||||||
|
quote.last_price,
|
||||||
|
snapshot.prev_close,
|
||||||
|
Some(quote.volume_delta as f64),
|
||||||
|
Some(quote.amount_delta),
|
||||||
|
Some(quote.bid1),
|
||||||
|
Some(quote.ask1),
|
||||||
|
buy,
|
||||||
|
sell,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
let price = snapshot.price(self.effective_execution_price_field(date));
|
||||||
|
if !price.is_finite() || price <= 0.0 {
|
||||||
|
return Err(BacktestError::Execution(format!(
|
||||||
|
"stock_pool_execution_price_missing:{symbol}:{date}"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
// A daily open does not reveal the session's volume/turnover.
|
||||||
|
let completed = self.effective_execution_price_field(date) == PriceField::Close;
|
||||||
|
(
|
||||||
|
price,
|
||||||
|
snapshot.prev_close,
|
||||||
|
completed.then_some(snapshot.volume as f64),
|
||||||
|
None,
|
||||||
|
Some(price),
|
||||||
|
Some(price),
|
||||||
|
self.snapshot_execution_price(data, snapshot, OrderSide::Buy, None)?,
|
||||||
|
self.snapshot_execution_price(data, snapshot, OrderSide::Sell, None)?,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
Ok(pool::MarketSnapshot {
|
||||||
|
symbol: symbol.clone(),
|
||||||
|
last_price: decimal(price, "price")?,
|
||||||
|
prev_close: Some(decimal(prev, "prev_close")?),
|
||||||
|
volume: volume.map(|v| decimal(v, "volume")).transpose()?,
|
||||||
|
turnover: amount.map(|v| decimal(v, "amount")).transpose()?,
|
||||||
|
bid_price_1: bid.map(|v| decimal(v, "bid")).transpose()?,
|
||||||
|
ask_price_1: ask.map(|v| decimal(v, "ask")).transpose()?,
|
||||||
|
is_kcb: Some(instrument.board.eq_ignore_ascii_case("KSH")),
|
||||||
|
instrument_rules: Some(pool::StockPoolInstrumentRules {
|
||||||
|
price_tick: decimal(snapshot.price_tick, "price_tick")?,
|
||||||
|
quantity_step: instrument.order_step_size().into(),
|
||||||
|
minimum_buy_quantity: instrument.minimum_order_quantity().into(),
|
||||||
|
}),
|
||||||
|
buy_sizing_price: Some(decimal(buy_price, "buy_price")?),
|
||||||
|
sell_sizing_price: Some(decimal(sell_price, "sell_price")?),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn process_stock_pool_contract(
|
||||||
|
&self,
|
||||||
|
date: NaiveDate,
|
||||||
|
portfolio: &mut PortfolioState,
|
||||||
|
data: &DataSet,
|
||||||
|
contract: &pool::FrozenStockPoolIntent,
|
||||||
|
intraday_turnover: &mut BTreeMap<String, u32>,
|
||||||
|
execution_cursors: &mut IntradayExecutionLedger,
|
||||||
|
global_execution_cursor: &mut Option<NaiveDateTime>,
|
||||||
|
commission_state: &mut BTreeMap<u64, f64>,
|
||||||
|
report: &mut BrokerExecutionReport,
|
||||||
|
) -> Result<(), BacktestError> {
|
||||||
|
if contract.signal_date > date
|
||||||
|
|| contract.frozen_equity < Decimal::ZERO
|
||||||
|
|| contract.generation.is_empty()
|
||||||
|
|| contract.pool_id.trim().is_empty()
|
||||||
|
{
|
||||||
|
return Err(BacktestError::Execution(
|
||||||
|
"stock_pool_frozen_intent_invalid".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if self.matching_type == MatchingType::NextBarOpen && contract.signal_date >= date {
|
||||||
|
return Err(BacktestError::Execution(
|
||||||
|
"stock_pool_next_open_requires_prior_signal".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let mut selection = contract.selection.clone();
|
||||||
|
let mut members = contract.members.clone();
|
||||||
|
for symbol in &contract.selection.requested_symbols {
|
||||||
|
let instrument = data.instruments().get(symbol).ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!("stock_pool_instrument_missing:{symbol}"))
|
||||||
|
})?;
|
||||||
|
if portfolio.position(symbol).is_none()
|
||||||
|
&& let Some(reason) = instrument.dated_market_absence_reason(date)
|
||||||
|
{
|
||||||
|
selection.requested_symbols.retain(|v| v != symbol);
|
||||||
|
selection.normal_trading_symbols.retain(|v| v != symbol);
|
||||||
|
selection.risk_eligible_symbols.retain(|v| v != symbol);
|
||||||
|
selection.final_symbols.retain(|v| v != symbol);
|
||||||
|
members.retain(|v| &v.symbol != symbol);
|
||||||
|
report.diagnostics.push(format!(
|
||||||
|
"stock_pool_market_absence symbol={symbol} date={date} reason={reason}"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut scope = selection
|
||||||
|
.requested_symbols
|
||||||
|
.iter()
|
||||||
|
.cloned()
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
scope.extend(portfolio.positions().keys().cloned());
|
||||||
|
let official_dates = data.calendar().iter().collect::<Vec<_>>();
|
||||||
|
let initial_positions = pool_positions(portfolio, date)?;
|
||||||
|
let state = portfolio
|
||||||
|
.stock_pool_execution_state(&contract.pool_id)
|
||||||
|
.observe(
|
||||||
|
contract.signal_date,
|
||||||
|
date,
|
||||||
|
&official_dates,
|
||||||
|
&members,
|
||||||
|
&initial_positions,
|
||||||
|
)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
portfolio
|
||||||
|
.set_stock_pool_execution_state(&contract.pool_id, state)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
if self.has_open_orders() {
|
||||||
|
report
|
||||||
|
.diagnostics
|
||||||
|
.push("stock_pool_waiting_for_active_orders no_new_intent=true".into());
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let mut constraints = contract.constraints.clone();
|
||||||
|
constraints.execution_date = Some(date);
|
||||||
|
constraints.frozen_positions.clear();
|
||||||
|
let mut quote_scope = scope.clone();
|
||||||
|
for symbol in &scope {
|
||||||
|
let paused = data.market(date, symbol).is_some_and(|row| row.paused)
|
||||||
|
|| data
|
||||||
|
.candidate(date, symbol)
|
||||||
|
.is_some_and(|row| row.is_paused);
|
||||||
|
if !paused {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
quote_scope.remove(symbol);
|
||||||
|
if let Some(position) = portfolio
|
||||||
|
.position(symbol)
|
||||||
|
.filter(|position| position.quantity > 0)
|
||||||
|
{
|
||||||
|
constraints.frozen_positions.insert(
|
||||||
|
symbol.clone(),
|
||||||
|
pool::FrozenStockPoolPosition {
|
||||||
|
trade_date: date,
|
||||||
|
reason: "paused".into(),
|
||||||
|
valuation_price: decimal(position.last_price, "paused_holding_valuation")?,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
selection
|
||||||
|
.normal_trading_symbols
|
||||||
|
.retain(|item| item != symbol);
|
||||||
|
selection
|
||||||
|
.risk_eligible_symbols
|
||||||
|
.retain(|item| item != symbol);
|
||||||
|
selection.final_symbols.retain(|item| item != symbol);
|
||||||
|
selection
|
||||||
|
.exclusion_reasons
|
||||||
|
.entry(symbol.clone())
|
||||||
|
.or_default()
|
||||||
|
.push("paused".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let before_positions = portfolio
|
||||||
|
.positions()
|
||||||
|
.keys()
|
||||||
|
.cloned()
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
for side in [pool::OrderSide::Sell, pool::OrderSide::Buy] {
|
||||||
|
let quotes =
|
||||||
|
self.pool_quote_inputs(date, data, "e_scope, *global_execution_cursor)?;
|
||||||
|
let positions = pool_positions(portfolio, date)?;
|
||||||
|
let execution_state = portfolio
|
||||||
|
.stock_pool_execution_state(&contract.pool_id)
|
||||||
|
.observe(
|
||||||
|
contract.signal_date,
|
||||||
|
date,
|
||||||
|
&official_dates,
|
||||||
|
&members,
|
||||||
|
&positions,
|
||||||
|
)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
constraints.pending_entry_symbols = execution_state.pending_symbols();
|
||||||
|
constraints.prior_target_weights = execution_state.last_target_weights.clone();
|
||||||
|
constraints.next_day_outside_exit_symbols = execution_state.next_day_exit_symbols(date);
|
||||||
|
let account = pool::AccountSnapshot {
|
||||||
|
total_equity: contract.frozen_equity,
|
||||||
|
cash: decimal(portfolio.cash(), "cash")?,
|
||||||
|
frozen_cash: Decimal::ZERO,
|
||||||
|
};
|
||||||
|
constraints.automatic_permissions.clear();
|
||||||
|
if contract.rule.automatic_trade_protection.enabled() {
|
||||||
|
for symbol in &scope {
|
||||||
|
let position = portfolio.position(symbol).filter(|p| p.quantity > 0);
|
||||||
|
let sold = self
|
||||||
|
.same_day_sold_symbols
|
||||||
|
.borrow()
|
||||||
|
.iter()
|
||||||
|
.rev()
|
||||||
|
.find(|(day, symbols)| **day <= date && symbols.contains(symbol))
|
||||||
|
.map(|(day, _)| *day);
|
||||||
|
let evidence = HoldingLifecycleEvidence {
|
||||||
|
has_position: position.is_some(),
|
||||||
|
opened_date: position.and_then(|p| p.opened_date()),
|
||||||
|
last_buy_date: position.and_then(|p| p.last_buy_date()),
|
||||||
|
last_sell_date: sold,
|
||||||
|
};
|
||||||
|
let permission = contract
|
||||||
|
.rule
|
||||||
|
.automatic_trade_protection
|
||||||
|
.evaluate(symbol, date, &evidence, data.calendar())
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
constraints
|
||||||
|
.automatic_permissions
|
||||||
|
.insert(symbol.clone(), permission);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if self
|
||||||
|
.risk_config
|
||||||
|
.static_rules
|
||||||
|
.forbid_same_day_rebuy_after_sell
|
||||||
|
{
|
||||||
|
constraints.same_day_sold_symbols.extend(
|
||||||
|
self.same_day_sold_symbols
|
||||||
|
.borrow()
|
||||||
|
.get(&date)
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.cloned(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
constraints.same_day_sold_symbols.extend(
|
||||||
|
before_positions
|
||||||
|
.iter()
|
||||||
|
.filter(|symbol| portfolio.position(symbol).is_none_or(|p| p.quantity == 0))
|
||||||
|
.cloned(),
|
||||||
|
);
|
||||||
|
let fee =
|
||||||
|
|symbol: &str, side: pool::OrderSide, gross: Decimal| -> Result<Decimal, String> {
|
||||||
|
let amount = gross
|
||||||
|
.to_f64()
|
||||||
|
.ok_or("stock_pool_cost_amount_out_of_range")?;
|
||||||
|
decimal(
|
||||||
|
self.cost_model
|
||||||
|
.calculate_for_instrument(
|
||||||
|
date,
|
||||||
|
if side == pool::OrderSide::Buy {
|
||||||
|
OrderSide::Buy
|
||||||
|
} else {
|
||||||
|
OrderSide::Sell
|
||||||
|
},
|
||||||
|
amount,
|
||||||
|
data.instruments().get(symbol),
|
||||||
|
)
|
||||||
|
.total(),
|
||||||
|
"fee",
|
||||||
|
)
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
|
};
|
||||||
|
let plan = pool::build_stock_pool_target_plan_with_fee_model(
|
||||||
|
&selection,
|
||||||
|
&members,
|
||||||
|
&contract.rule,
|
||||||
|
&account,
|
||||||
|
&positions,
|
||||||
|
"es,
|
||||||
|
contract.invest_ratio_bps,
|
||||||
|
contract.reserve_cash,
|
||||||
|
&contract.out_of_pool_policy,
|
||||||
|
"full_rebalance",
|
||||||
|
&constraints,
|
||||||
|
&contract.generation,
|
||||||
|
Decimal::ZERO,
|
||||||
|
Decimal::ZERO,
|
||||||
|
Decimal::ZERO,
|
||||||
|
Some(&fee),
|
||||||
|
)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
let updated = execution_state
|
||||||
|
.record_plan(contract.signal_date, &contract.generation, &plan)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
portfolio
|
||||||
|
.set_stock_pool_execution_state(&contract.pool_id, updated)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
report.diagnostics.push(format!("stock_pool_plan phase={side:?} generation={} requested_bps={} effective_bps={} budget={}",contract.generation,plan.requested_invest_ratio_bps,plan.effective_invest_ratio_bps,plan.budget));
|
||||||
|
let max_positions = constraints
|
||||||
|
.target_holding_count
|
||||||
|
.unwrap_or(selection.final_symbols.len());
|
||||||
|
for row in plan.rows {
|
||||||
|
if side == pool::OrderSide::Buy && row.side.is_none() {
|
||||||
|
report.diagnostics.push(format!(
|
||||||
|
"stock_pool_decision symbol={} status={} current={} target={} reason={}",
|
||||||
|
row.symbol,
|
||||||
|
row.status,
|
||||||
|
row.current_quantity,
|
||||||
|
row.target_quantity,
|
||||||
|
row.reason
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if row.side != Some(side) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if side == pool::OrderSide::Buy
|
||||||
|
&& portfolio
|
||||||
|
.position(&row.symbol)
|
||||||
|
.is_none_or(|p| p.quantity == 0)
|
||||||
|
&& Self::positive_position_count(portfolio) >= max_positions
|
||||||
|
{
|
||||||
|
report.diagnostics.push(format!(
|
||||||
|
"stock_pool_buy_deferred symbol={} reason=occupied_position_slots",
|
||||||
|
row.symbol
|
||||||
|
));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let target = row.target_quantity.to_i32().ok_or_else(|| {
|
||||||
|
BacktestError::Execution("stock_pool_target_quantity_out_of_range".into())
|
||||||
|
})?;
|
||||||
|
let reason = row.source_intent.as_deref().unwrap_or("stock_pool_target");
|
||||||
|
if let Some(price) = row.limit_price {
|
||||||
|
self.process_limit_target_shares(
|
||||||
|
date,
|
||||||
|
portfolio,
|
||||||
|
data,
|
||||||
|
&row.symbol,
|
||||||
|
target,
|
||||||
|
price.to_f64().ok_or_else(|| {
|
||||||
|
BacktestError::Execution("stock_pool_limit_price_out_of_range".into())
|
||||||
|
})?,
|
||||||
|
reason,
|
||||||
|
intraday_turnover,
|
||||||
|
execution_cursors,
|
||||||
|
global_execution_cursor,
|
||||||
|
commission_state,
|
||||||
|
report,
|
||||||
|
)?;
|
||||||
|
} else {
|
||||||
|
self.process_target_shares(
|
||||||
|
date,
|
||||||
|
portfolio,
|
||||||
|
data,
|
||||||
|
&row.symbol,
|
||||||
|
target,
|
||||||
|
reason,
|
||||||
|
intraday_turnover,
|
||||||
|
execution_cursors,
|
||||||
|
global_execution_cursor,
|
||||||
|
commission_state,
|
||||||
|
report,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ use chrono::NaiveDate;
|
|||||||
use crate::events::OrderSide;
|
use crate::events::OrderSide;
|
||||||
use crate::fixed_point::{FixedChinaAShareCostModel, FixedMoney, FixedTradingCost};
|
use crate::fixed_point::{FixedChinaAShareCostModel, FixedMoney, FixedTradingCost};
|
||||||
use crate::risk_control::TradingConstraintConfig;
|
use crate::risk_control::TradingConstraintConfig;
|
||||||
|
use crate::Instrument;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
pub struct TradingCost {
|
pub struct TradingCost {
|
||||||
@@ -35,6 +36,17 @@ impl TradingCost {
|
|||||||
pub trait CostModel {
|
pub trait CostModel {
|
||||||
fn calculate(&self, date: NaiveDate, side: OrderSide, gross_amount: f64) -> TradingCost;
|
fn calculate(&self, date: NaiveDate, side: OrderSide, gross_amount: f64) -> TradingCost;
|
||||||
|
|
||||||
|
fn calculate_for_instrument(&self, date: NaiveDate, side: OrderSide, gross_amount: f64, _instrument: Option<&Instrument>) -> TradingCost {
|
||||||
|
self.calculate(date, side, gross_amount)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn calculate_with_order_state_for_instrument(
|
||||||
|
&self, date: NaiveDate, side: OrderSide, gross_amount: f64,
|
||||||
|
order_id: Option<u64>, commission_state: &mut BTreeMap<u64,f64>, _instrument: Option<&Instrument>,
|
||||||
|
) -> TradingCost {
|
||||||
|
self.calculate_with_order_state(date, side, gross_amount, order_id, commission_state)
|
||||||
|
}
|
||||||
|
|
||||||
fn calculate_with_order_state(
|
fn calculate_with_order_state(
|
||||||
&self,
|
&self,
|
||||||
date: NaiveDate,
|
date: NaiveDate,
|
||||||
@@ -215,6 +227,27 @@ impl ChinaAShareCostModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl CostModel for ChinaAShareCostModel {
|
impl CostModel for ChinaAShareCostModel {
|
||||||
|
fn calculate_for_instrument(&self, date: NaiveDate, side: OrderSide, gross_amount: f64, instrument: Option<&Instrument>) -> TradingCost {
|
||||||
|
let mut cost = self.calculate(date, side, gross_amount);
|
||||||
|
if instrument.is_some_and(Instrument::is_exchange_traded_fund) {
|
||||||
|
cost.stamp_tax = 0.0;
|
||||||
|
cost.transfer_fee = 0.0;
|
||||||
|
}
|
||||||
|
cost
|
||||||
|
}
|
||||||
|
|
||||||
|
fn calculate_with_order_state_for_instrument(
|
||||||
|
&self, date: NaiveDate, side: OrderSide, gross_amount: f64,
|
||||||
|
order_id: Option<u64>, commission_state: &mut BTreeMap<u64,f64>, instrument: Option<&Instrument>,
|
||||||
|
) -> TradingCost {
|
||||||
|
let mut cost = self.calculate_with_order_state(date, side, gross_amount, order_id, commission_state);
|
||||||
|
if instrument.is_some_and(Instrument::is_exchange_traded_fund) {
|
||||||
|
cost.stamp_tax = 0.0;
|
||||||
|
cost.transfer_fee = 0.0;
|
||||||
|
}
|
||||||
|
cost
|
||||||
|
}
|
||||||
|
|
||||||
fn calculate(&self, date: NaiveDate, side: OrderSide, gross_amount: f64) -> TradingCost {
|
fn calculate(&self, date: NaiveDate, side: OrderSide, gross_amount: f64) -> TradingCost {
|
||||||
if gross_amount <= 0.0 {
|
if gross_amount <= 0.0 {
|
||||||
return TradingCost {
|
return TradingCost {
|
||||||
@@ -273,6 +306,25 @@ impl CostModel for ChinaAShareCostModel {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fund_fees_use_admitted_instrument_type_and_share_the_order_commission_budget() {
|
||||||
|
let day=NaiveDate::from_ymd_opt(2026,9,11).unwrap();
|
||||||
|
let model=ChinaAShareCostModel::from_trading_constraints(TradingConstraintConfig{commission_rate:0.0003,minimum_commission:5.,transfer_fee_rate:0.00001,..Default::default()});
|
||||||
|
let mut instrument=Instrument{symbol:"510300.SH".into(),name:"fixture".into(),board:"ETF".into(),round_lot:100,listed_at:Some(day),delisted_at:None,status:"active".into()};
|
||||||
|
for side in [OrderSide::Buy,OrderSide::Sell] {
|
||||||
|
let cost=model.calculate_for_instrument(day,side,10_000.,Some(&instrument));
|
||||||
|
assert_eq!(cost.commission,5.);assert_eq!(cost.stamp_tax,0.);assert_eq!(cost.transfer_fee,0.);
|
||||||
|
let mut state=BTreeMap::new();
|
||||||
|
let one=model.calculate_with_order_state_for_instrument(day,side,1_000.,Some(1),&mut state,Some(&instrument));
|
||||||
|
let two=model.calculate_with_order_state_for_instrument(day,side,9_000.,Some(1),&mut state,Some(&instrument));
|
||||||
|
assert_eq!(one.total()+two.total(),cost.total());
|
||||||
|
}
|
||||||
|
instrument.board="SH".into();
|
||||||
|
let stock=model.calculate_for_instrument(day,OrderSide::Sell,10_000.,Some(&instrument));
|
||||||
|
assert_eq!(stock.stamp_tax,5.);assert_eq!(stock.transfer_fee,0.1);
|
||||||
|
assert_eq!(stock.total(),model.calculate(day,OrderSide::Sell,10_000.).total());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn default_quantizes_fees_to_micro_yuan() {
|
fn default_quantizes_fees_to_micro_yuan() {
|
||||||
let model = ChinaAShareCostModel::default();
|
let model = ChinaAShareCostModel::default();
|
||||||
|
|||||||
@@ -2849,9 +2849,16 @@ where
|
|||||||
"bar:post",
|
"bar:post",
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
if should_run_minute_events(&intraday_schedule_rules, &self.subscriptions) {
|
if should_run_minute_events(&intraday_schedule_rules, &self.subscriptions)
|
||||||
if self.execution_quote_loader.is_some() && !self.subscriptions.is_empty() {
|
|| (self.broker.has_open_orders() && self.broker.matching_type_uses_intraday_quotes())
|
||||||
let mut minute_symbols = self.subscriptions.clone();
|
{
|
||||||
|
let unfiltered_minute_stream = self.subscriptions.is_empty();
|
||||||
|
let mut full_minute_symbols = self.subscriptions.clone();
|
||||||
|
if self.broker.matching_type_uses_intraday_quotes() {
|
||||||
|
full_minute_symbols.extend(self.broker.open_order_views().into_iter().map(|order| order.symbol));
|
||||||
|
}
|
||||||
|
if self.execution_quote_loader.is_some() && !full_minute_symbols.is_empty() {
|
||||||
|
let mut minute_symbols = full_minute_symbols.clone();
|
||||||
self.load_missing_execution_quotes(
|
self.load_missing_execution_quotes(
|
||||||
execution_date,
|
execution_date,
|
||||||
None,
|
None,
|
||||||
@@ -2862,11 +2869,11 @@ where
|
|||||||
// Keep the iterator attached to an O(1) DataSet clone. This
|
// Keep the iterator attached to an O(1) DataSet clone. This
|
||||||
// preserves the immutable quote snapshot for the day while
|
// preserves the immutable quote snapshot for the day while
|
||||||
// allowing lazy quote loads and broker state updates on self.
|
// allowing lazy quote loads and broker state updates on self.
|
||||||
let quote_data = self.data.clone();
|
let mut quote_data = self.data.clone();
|
||||||
let mut minute_quotes = quote_data
|
let mut minute_quotes = quote_data
|
||||||
.execution_quotes_iter_on_date_for_symbols(
|
.execution_quotes_iter_on_date_for_symbols(
|
||||||
execution_date,
|
execution_date,
|
||||||
(!self.subscriptions.is_empty()).then_some(&self.subscriptions),
|
(!unfiltered_minute_stream).then_some(&full_minute_symbols),
|
||||||
)
|
)
|
||||||
.peekable();
|
.peekable();
|
||||||
let requires_minute_callbacks = self.strategy.requires_minute_callbacks();
|
let requires_minute_callbacks = self.strategy.requires_minute_callbacks();
|
||||||
@@ -2893,18 +2900,26 @@ where
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.peekable();
|
.peekable();
|
||||||
let mut minute_group = Vec::new();
|
let mut minute_group = Vec::new();
|
||||||
|
let mut last_minute_timestamp = None;
|
||||||
// Merge the immutable quote stream with clock events. Equal
|
// Merge the immutable quote stream with clock events. Equal
|
||||||
// timestamps form one event; scheduled callbacks run before
|
// timestamps form one event; scheduled callbacks run before
|
||||||
// `on_minute` below.
|
// `on_minute` below.
|
||||||
loop {
|
loop {
|
||||||
let next_quote_timestamp = minute_quotes.peek().map(|quote| quote.timestamp);
|
let next_quote_timestamp = minute_quotes.peek().map(|quote| quote.timestamp);
|
||||||
let next_schedule_timestamp = minute_schedule_timestamps.peek().copied();
|
let next_schedule_timestamp = minute_schedule_timestamps.peek().copied();
|
||||||
|
let next_expiry_timestamp = self.broker.next_day_order_expiry(execution_date)
|
||||||
|
.map(|time| execution_date.and_time(time))
|
||||||
|
.filter(|time| last_minute_timestamp.is_none_or(|last| last < *time));
|
||||||
let Some(minute_timestamp) =
|
let Some(minute_timestamp) =
|
||||||
next_minute_event_timestamp(next_quote_timestamp, next_schedule_timestamp)
|
next_minute_event_timestamp(
|
||||||
|
next_minute_event_timestamp(next_quote_timestamp, next_schedule_timestamp),
|
||||||
|
next_expiry_timestamp,
|
||||||
|
)
|
||||||
else {
|
else {
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
let minute_time = minute_timestamp.time();
|
let minute_time = minute_timestamp.time();
|
||||||
|
last_minute_timestamp = Some(minute_timestamp);
|
||||||
minute_group.clear();
|
minute_group.clear();
|
||||||
while minute_quotes
|
while minute_quotes
|
||||||
.peek()
|
.peek()
|
||||||
@@ -2913,7 +2928,8 @@ where
|
|||||||
minute_group.push(
|
minute_group.push(
|
||||||
minute_quotes
|
minute_quotes
|
||||||
.next()
|
.next()
|
||||||
.expect("peeked minute quote must be available"),
|
.expect("peeked minute quote must be available")
|
||||||
|
.clone(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let has_specific_schedule = next_schedule_timestamp == Some(minute_timestamp);
|
let has_specific_schedule = next_schedule_timestamp == Some(minute_timestamp);
|
||||||
@@ -2985,7 +3001,10 @@ where
|
|||||||
crate::strategy::StrategyDecision::default()
|
crate::strategy::StrategyDecision::default()
|
||||||
};
|
};
|
||||||
if requires_minute_callbacks {
|
if requires_minute_callbacks {
|
||||||
for "e in &minute_group {
|
for quote in &minute_group {
|
||||||
|
if !self.subscriptions.is_empty() && !self.subscriptions.contains("e.symbol) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
minute_decision.merge_from(self.strategy.on_minute(
|
minute_decision.merge_from(self.strategy.on_minute(
|
||||||
&StrategyContext {
|
&StrategyContext {
|
||||||
execution_date,
|
execution_date,
|
||||||
@@ -3098,6 +3117,28 @@ where
|
|||||||
ProcessEventKind::PostMinute,
|
ProcessEventKind::PostMinute,
|
||||||
format!("minute:{minute_timestamp}:post"),
|
format!("minute:{minute_timestamp}:post"),
|
||||||
)?;
|
)?;
|
||||||
|
// A scheduled strategy need not subscribe to every
|
||||||
|
// minute to keep a DAY/GTC limit order alive. Fetch the
|
||||||
|
// resting symbols once, then resume the actual quote
|
||||||
|
// clock strictly after the event already processed.
|
||||||
|
let mut newly_pending = self.broker.open_order_views().into_iter()
|
||||||
|
.map(|order| order.symbol)
|
||||||
|
.filter(|symbol| !full_minute_symbols.contains(symbol))
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
if !newly_pending.is_empty() && self.broker.matching_type_uses_intraday_quotes() {
|
||||||
|
full_minute_symbols.extend(newly_pending.iter().cloned());
|
||||||
|
if self.execution_quote_loader.is_some() {
|
||||||
|
self.load_missing_execution_quotes(execution_date, None, None, &mut newly_pending)?;
|
||||||
|
}
|
||||||
|
drop(minute_quotes);
|
||||||
|
quote_data = self.data.clone();
|
||||||
|
minute_quotes = quote_data.execution_quotes_iter_on_date_for_symbols(
|
||||||
|
execution_date, (!unfiltered_minute_stream).then_some(&full_minute_symbols),
|
||||||
|
).peekable();
|
||||||
|
while minute_quotes.peek().is_some_and(|quote| quote.timestamp <= minute_timestamp) {
|
||||||
|
minute_quotes.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
drop(minute_group);
|
drop(minute_group);
|
||||||
drop(minute_quotes);
|
drop(minute_quotes);
|
||||||
@@ -4097,6 +4138,10 @@ fn execution_quote_symbols_for_decision(
|
|||||||
|
|
||||||
for intent in &decision.order_intents {
|
for intent in &decision.order_intents {
|
||||||
match intent.unwrapped() {
|
match intent.unwrapped() {
|
||||||
|
OrderIntent::StockPool { contract } => {
|
||||||
|
symbols.extend(contract.selection.requested_symbols.iter().cloned());
|
||||||
|
symbols.extend(portfolio.positions().keys().cloned());
|
||||||
|
}
|
||||||
OrderIntent::Shares { symbol, .. }
|
OrderIntent::Shares { symbol, .. }
|
||||||
| OrderIntent::LimitShares { symbol, .. }
|
| OrderIntent::LimitShares { symbol, .. }
|
||||||
| OrderIntent::Lots { symbol, .. }
|
| OrderIntent::Lots { symbol, .. }
|
||||||
@@ -5843,6 +5888,72 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scheduled_day_limit_order_loads_later_quotes_without_strategy_minute_subscription() {
|
||||||
|
struct RestingLimit { quantity: i32 }
|
||||||
|
impl Strategy for RestingLimit {
|
||||||
|
fn name(&self) -> &str { "resting-limit" }
|
||||||
|
fn requires_minute_callbacks(&self) -> bool { false }
|
||||||
|
fn schedule_rules(&self) -> Vec<ScheduleRule> {
|
||||||
|
vec![ScheduleRule::daily("open", ScheduleStage::OnDay)
|
||||||
|
.with_time_rule(ScheduleTimeRule::physical_time(9, 30))]
|
||||||
|
}
|
||||||
|
fn on_scheduled(&mut self, _: &StrategyContext<'_>, _: &ScheduleRule) -> Result<StrategyDecision, crate::BacktestError> {
|
||||||
|
Ok(StrategyDecision { order_intents: vec![OrderIntent::LimitTargetShares {
|
||||||
|
symbol: SYMBOL.into(), target_quantity: self.quantity, limit_price: 10.0, reason: "resting-entry".into(),
|
||||||
|
}], ..StrategyDecision::default() })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for scenario in 0..4 {
|
||||||
|
let partial = scenario == 1;
|
||||||
|
let closing_only = scenario >= 2;
|
||||||
|
let date = if closing_only { d(2026, 7, 6) } else { d(2026, 6, 1) };
|
||||||
|
let quote = |hour, minute, price| IntradayExecutionQuote {
|
||||||
|
date, symbol: SYMBOL.into(), timestamp: date.and_hms_opt(hour, minute, 0).unwrap(),
|
||||||
|
last_price: price, bid1: price, ask1: price, bid1_volume: 10_000, ask1_volume: 10_000,
|
||||||
|
volume_delta: 10_000, amount_delta: price * 10_000.0, trading_phase: None,
|
||||||
|
};
|
||||||
|
let first = quote(9, 30, if partial { 9.8 } else { 10.2 });
|
||||||
|
let earlier = quote(9, 29, 9.0);
|
||||||
|
let unchanged = quote(9, 45, 10.2);
|
||||||
|
let later = quote(10, 0, if closing_only { 10.2 } else { 9.8 });
|
||||||
|
let last = if closing_only { quote(15, 0, if scenario == 2 { 9.8 } else { 10.2 }) } else { quote(10, 1, 9.8) };
|
||||||
|
let mut post_close = quote(15, 5, 9.7);
|
||||||
|
post_close.trading_phase = Some("post_close_fixed_price".into());
|
||||||
|
let mut data = dataset_from_market_and_candidates(vec![market(date, 10.2, 9.8)], vec![candidate(date)]);
|
||||||
|
data.add_execution_quotes(vec![first.clone()]);
|
||||||
|
let broker = BrokerSimulator::new(ChinaAShareCostModel::default(), ChinaEquityRuleHooks)
|
||||||
|
.with_matching_type(MatchingType::CurrentBarClose)
|
||||||
|
.with_intraday_execution_start_time(NaiveTime::from_hms_opt(9, 30, 0).unwrap())
|
||||||
|
.with_volume_limit(partial).with_volume_percent(0.01).with_liquidity_limit(false).with_inactive_limit(false);
|
||||||
|
let requests = Arc::new(Mutex::new(Vec::new()));
|
||||||
|
let captured = Arc::clone(&requests);
|
||||||
|
let mut engine = BacktestEngine::new(data, RestingLimit { quantity: if partial { 300 } else { 100 } }, broker, BacktestConfig {
|
||||||
|
initial_cash: 100_000.0, benchmark_code: "000852.SH".into(), start_date: Some(date), end_date: Some(date),
|
||||||
|
decision_lag_trading_days: 0, execution_price_field: PriceField::Close,
|
||||||
|
}).with_execution_quote_loader(move |request| {
|
||||||
|
captured.lock().unwrap().push((request.start_time, request.end_time));
|
||||||
|
Ok(vec![earlier.clone(), first.clone(), unchanged.clone(), later.clone(), last.clone(), post_close.clone()])
|
||||||
|
});
|
||||||
|
let result = engine.run().unwrap();
|
||||||
|
if scenario == 3 {
|
||||||
|
assert!(result.fills.is_empty(), "continuous DAY order must not migrate to post-close execution");
|
||||||
|
assert_eq!(result.order_events.len(), 2, "only initial pending and expiry are state changes");
|
||||||
|
assert_eq!(result.order_events.last().unwrap().status, crate::OrderStatus::Expired);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
assert_eq!(result.fills.len(), if partial { 3 } else { 1 }, "resting DAY order must match later actual quotes: {:?}", result.order_events);
|
||||||
|
assert_eq!(result.fills[0].execution_timestamp, if partial { date.and_hms_opt(9, 30, 0) } else if closing_only { date.and_hms_opt(15, 0, 0) } else { date.and_hms_opt(10, 0, 0) });
|
||||||
|
assert_eq!(result.fills[0].price, 9.8);
|
||||||
|
assert_eq!(result.fills[0].quantity, 100);
|
||||||
|
assert_eq!(result.fills.iter().map(|fill| fill.quantity).sum::<u32>(), if partial { 300 } else { 100 });
|
||||||
|
assert!(result.fills.iter().all(|fill| fill.execution_timestamp >= date.and_hms_opt(9, 30, 0)));
|
||||||
|
assert_eq!(requests.lock().unwrap().as_slice(), &[(None, None)]);
|
||||||
|
assert!(!result.order_events.iter().any(|order| order.status == crate::OrderStatus::Expired));
|
||||||
|
assert_eq!(result.order_events.len(), if partial { 3 } else { 2 }, "unchanged pending attempts must not emit state transitions");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn scheduled_event_detail_records_actual_time_only_for_timed_rules() {
|
fn scheduled_event_detail_records_actual_time_only_for_timed_rules() {
|
||||||
let timed = ScheduleRule::daily("timed", ScheduleStage::OnDay)
|
let timed = ScheduleRule::daily("timed", ScheduleStage::OnDay)
|
||||||
|
|||||||
@@ -0,0 +1,170 @@
|
|||||||
|
//! Causal volume budgets. Session totals may audit fills, never size earlier orders.
|
||||||
|
use chrono::{NaiveDate, NaiveDateTime};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
pub enum VolumeCapacityMode {
|
||||||
|
#[default]
|
||||||
|
ExecutionObservation,
|
||||||
|
CompletedBar,
|
||||||
|
SessionCapacityAudit,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Error)]
|
||||||
|
pub enum CapacityError {
|
||||||
|
#[error("execution capacity ratio must be finite and in (0, 1]")]
|
||||||
|
InvalidRatio,
|
||||||
|
#[error("execution capacity decimal cannot be represented exactly")]
|
||||||
|
InvalidDecimal,
|
||||||
|
#[error("execution capacity observation has invalid time bounds")]
|
||||||
|
InvalidWindow,
|
||||||
|
#[error("execution capacity is not visible: available={available_at}, execution={execution_at}")]
|
||||||
|
NotVisible { available_at: NaiveDateTime, execution_at: NaiveDateTime },
|
||||||
|
#[error("execution capacity observation belongs to another session")]
|
||||||
|
WrongSession,
|
||||||
|
#[error("execution-time capacity is missing; daily session volume cannot size an earlier fill")]
|
||||||
|
MissingObservation,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Decimal semantics of the frozen JSON rate, evaluated without a float product.
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct ParticipationRate {
|
||||||
|
numerator: u128,
|
||||||
|
denominator: u128,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ParticipationRate {
|
||||||
|
pub fn new(rate: f64) -> Result<Self, CapacityError> {
|
||||||
|
if !rate.is_finite() || rate <= 0.0 || rate > 1.0 {
|
||||||
|
return Err(CapacityError::InvalidRatio);
|
||||||
|
}
|
||||||
|
if rate < 1e-20 {
|
||||||
|
// Even u64::MAX shares at this rate cannot admit a single share.
|
||||||
|
return Ok(Self { numerator: 0, denominator: 1 });
|
||||||
|
}
|
||||||
|
if rate == 1.0 {
|
||||||
|
return Ok(Self { numerator: 1, denominator: 1 });
|
||||||
|
}
|
||||||
|
let text = rate.to_string();
|
||||||
|
let digits = text.strip_prefix("0.").ok_or(CapacityError::InvalidDecimal)?;
|
||||||
|
let digits = digits.trim_end_matches('0');
|
||||||
|
let numerator = digits.parse::<u128>().map_err(|_| CapacityError::InvalidDecimal)?;
|
||||||
|
let denominator = 10_u128.checked_pow(digits.len() as u32).ok_or(CapacityError::InvalidDecimal)?;
|
||||||
|
if numerator > u128::MAX / u128::from(u64::MAX) {
|
||||||
|
return Err(CapacityError::InvalidDecimal);
|
||||||
|
}
|
||||||
|
Ok(Self { numerator, denominator })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn total_shares(self, market_shares: u64) -> u64 {
|
||||||
|
let total = u128::from(market_shares) * self.numerator / self.denominator;
|
||||||
|
u64::try_from(total).expect("participation rate cannot exceed the market shares")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn remaining(self, market_shares: u64, consumed_shares: u64, requested: u32) -> u32 {
|
||||||
|
self.total_shares(market_shares).saturating_sub(consumed_shares).min(u64::from(requested)) as u32
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
pub enum VolumeObservationKind {
|
||||||
|
TradeIncrement,
|
||||||
|
CompletedBar,
|
||||||
|
CumulativeSession,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
|
||||||
|
pub struct VolumeObservation {
|
||||||
|
pub kind: VolumeObservationKind,
|
||||||
|
pub start: NaiveDateTime,
|
||||||
|
pub end: NaiveDateTime,
|
||||||
|
pub available_at: NaiveDateTime,
|
||||||
|
pub shares: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl VolumeObservation {
|
||||||
|
pub fn visible_shares(self, execution_at: NaiveDateTime) -> Result<u64, CapacityError> {
|
||||||
|
if self.start > self.end || self.available_at < self.end {
|
||||||
|
return Err(CapacityError::InvalidWindow);
|
||||||
|
}
|
||||||
|
if self.available_at > execution_at {
|
||||||
|
return Err(CapacityError::NotVisible { available_at: self.available_at, execution_at });
|
||||||
|
}
|
||||||
|
if self.start.date() != self.end.date() || self.end.date() != execution_at.date() {
|
||||||
|
return Err(CapacityError::WrongSession);
|
||||||
|
}
|
||||||
|
Ok(self.shares)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn remaining(self, execution_at: NaiveDateTime, rate: ParticipationRate, consumed: u64, requested: u32) -> Result<u32, CapacityError> {
|
||||||
|
Ok(rate.remaining(self.visible_shares(execution_at)?, consumed, requested))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||||
|
pub struct SessionCapacityAudit {
|
||||||
|
pub date: NaiveDate,
|
||||||
|
pub symbol: String,
|
||||||
|
pub filled_shares: u64,
|
||||||
|
pub session_shares: u64,
|
||||||
|
pub allowed_shares: u64,
|
||||||
|
pub passed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SessionCapacityAudit {
|
||||||
|
pub fn new(date: NaiveDate, symbol: String, filled_shares: u64, session_shares: u64, rate: ParticipationRate) -> Self {
|
||||||
|
let allowed_shares = rate.total_shares(session_shares);
|
||||||
|
Self { date, symbol, filled_shares, session_shares, allowed_shares, passed: filled_shares <= allowed_shares }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn decimal_participation_never_rounds_a_fractional_share_up_or_overflows() {
|
||||||
|
assert_eq!(ParticipationRate::new(0.58).unwrap().total_shares(50), 29);
|
||||||
|
assert_eq!(ParticipationRate::new(0.25).unwrap().total_shares(3), 0);
|
||||||
|
assert_eq!(ParticipationRate::new(0.5).unwrap().total_shares(3), 1);
|
||||||
|
assert_eq!(ParticipationRate::new(1.).unwrap().total_shares(u64::MAX), u64::MAX);
|
||||||
|
assert_eq!(ParticipationRate::new(0.25).unwrap().remaining(u64::MAX, 0, u32::MAX), u32::MAX);
|
||||||
|
assert_eq!(ParticipationRate::new(f64::MIN_POSITIVE).unwrap().total_shares(u64::MAX), 0);
|
||||||
|
for rate in [0., -1., f64::NAN, f64::INFINITY, 1.001] {
|
||||||
|
assert!(ParticipationRate::new(rate).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn completed_volume_cannot_be_used_for_an_earlier_open() {
|
||||||
|
let day = NaiveDate::from_ymd_opt(2025,1,2).unwrap();
|
||||||
|
let opening = day.and_hms_opt(9,30,0).unwrap();
|
||||||
|
let closing = day.and_hms_opt(15,0,0).unwrap();
|
||||||
|
let observation = VolumeObservation { kind:VolumeObservationKind::CompletedBar, start:opening, end:closing, available_at:closing, shares:10000 };
|
||||||
|
assert!(matches!(observation.visible_shares(opening), Err(CapacityError::NotVisible { .. })));
|
||||||
|
assert_eq!(observation.remaining(closing, ParticipationRate::new(0.25).unwrap(), 1000, 5000).unwrap(), 1500);
|
||||||
|
assert!(matches!(observation.visible_shares(closing+chrono::Duration::days(1)), Err(CapacityError::WrongSession)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn delayed_publication_and_invalid_bounds_are_not_treated_as_zero_volume() {
|
||||||
|
let at = NaiveDate::from_ymd_opt(2025,1,2).unwrap().and_hms_opt(10,18,0).unwrap();
|
||||||
|
let observation = VolumeObservation { kind:VolumeObservationKind::TradeIncrement, start:at, end:at, available_at:at+chrono::Duration::seconds(1), shares:0 };
|
||||||
|
assert!(matches!(observation.visible_shares(at), Err(CapacityError::NotVisible { .. })));
|
||||||
|
assert_eq!(VolumeObservation { available_at:at-chrono::Duration::seconds(1), ..observation }.visible_shares(at), Err(CapacityError::InvalidWindow));
|
||||||
|
assert_eq!(VolumeObservation { available_at:at, ..observation }.visible_shares(at).unwrap(), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn session_audit_changes_verdict_not_executed_quantity() {
|
||||||
|
let day = NaiveDate::from_ymd_opt(2025,1,2).unwrap();
|
||||||
|
let rate = ParticipationRate::new(0.25).unwrap();
|
||||||
|
let a = SessionCapacityAudit::new(day,"TEST".into(),1000,3000,rate);
|
||||||
|
let b = SessionCapacityAudit::new(day,"TEST".into(),1000,5000,rate);
|
||||||
|
assert!(!a.passed); assert!(b.passed);
|
||||||
|
assert_eq!(a.filled_shares,b.filled_shares);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
use chrono::NaiveDateTime;
|
||||||
|
|
||||||
|
use crate::engine::BacktestError;
|
||||||
|
|
||||||
|
/// Cumulative TWAP entitlement depends on the frozen clock, not future quotes.
|
||||||
|
pub(crate) struct TwapSchedule {
|
||||||
|
start: NaiveDateTime,
|
||||||
|
end: NaiveDateTime,
|
||||||
|
quantity: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TwapSchedule {
|
||||||
|
pub(crate) fn new(
|
||||||
|
start: Option<NaiveDateTime>,
|
||||||
|
end: Option<NaiveDateTime>,
|
||||||
|
quantity: u32,
|
||||||
|
) -> Result<Self, BacktestError> {
|
||||||
|
let (Some(start), Some(end)) = (start, end) else {
|
||||||
|
return Err(BacktestError::Execution("TWAP requires an explicit start and end clock".into()));
|
||||||
|
};
|
||||||
|
if end < start || start.date() != end.date() {
|
||||||
|
return Err(BacktestError::Execution("TWAP requires an ordered same-session clock window".into()));
|
||||||
|
}
|
||||||
|
Ok(Self { start, end, quantity })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn due_quantity(&self, at: NaiveDateTime, filled: u32) -> u32 {
|
||||||
|
if at < self.start {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
let entitlement = if at >= self.end {
|
||||||
|
self.quantity
|
||||||
|
} else {
|
||||||
|
let elapsed = (at - self.start).num_microseconds().expect("same-day interval") as u128;
|
||||||
|
let duration = (self.end - self.start).num_microseconds().expect("same-day interval") as u128;
|
||||||
|
(u128::from(self.quantity) * elapsed / duration) as u32
|
||||||
|
};
|
||||||
|
entitlement.saturating_sub(filled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use chrono::{Duration, NaiveDate};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn clock_entitlements_are_exact_and_allow_backlog_without_future_quote_counts() {
|
||||||
|
let start = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap().and_hms_opt(10, 0, 0).unwrap();
|
||||||
|
let end = start + Duration::minutes(10);
|
||||||
|
let schedule = TwapSchedule::new(Some(start), Some(end), 1_000).unwrap();
|
||||||
|
assert_eq!(schedule.due_quantity(start, 0), 0);
|
||||||
|
assert_eq!(schedule.due_quantity(start + Duration::minutes(2), 0), 200);
|
||||||
|
assert_eq!(schedule.due_quantity(start + Duration::minutes(5), 100), 400);
|
||||||
|
assert_eq!(schedule.due_quantity(end, 100), 900);
|
||||||
|
assert_eq!(schedule.due_quantity(end, 1_000), 0);
|
||||||
|
assert!(TwapSchedule::new(Some(start), None, 1_000).is_err());
|
||||||
|
assert!(TwapSchedule::new(Some(end), Some(start), 1_000).is_err());
|
||||||
|
assert_eq!(TwapSchedule::new(Some(start), Some(start), 1_000).unwrap().due_quantity(start, 0), 1_000);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
//! Indicator metadata is versioned independently from the numerical kernel.
|
||||||
|
use crate::factor_events::{CONTRACT, OPERATORS, TA_REV};
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use ta_lib::abstract_api::{self, OptInputType};
|
||||||
|
|
||||||
|
pub fn catalog() -> Value {
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
let mut implementation = Sha256::new();
|
||||||
|
for file in [include_bytes!("factor_events.rs").as_slice(), include_bytes!("factor_cross_section.rs").as_slice(),
|
||||||
|
include_bytes!("daily_patterns.rs").as_slice(),include_bytes!("market_event_context.rs").as_slice(),
|
||||||
|
include_bytes!("session_events.rs").as_slice(),include_bytes!("pattern_context.rs").as_slice(),TA_REV.as_bytes()] {implementation.update(file);}
|
||||||
|
let implementation_sha256=format!("{:x}",implementation.finalize());
|
||||||
|
let indicators: Vec<Value> = abstract_api::funcs().map(|f| json!({
|
||||||
|
"name":f.name, "group":format!("{:?}",f.group), "description":f.hint,
|
||||||
|
"inputs":f.inputs.iter().map(|p|json!({"name":p.param_name,"kind":format!("{:?}",p.kind),"flags":p.flags.0})).collect::<Vec<_>>(),
|
||||||
|
"parameters":f.opt_inputs.iter().map(|p|json!({"name":p.param_name,"label":p.display_name,"description":p.hint,"domain":parameter_domain(p.kind)})).collect::<Vec<_>>(),
|
||||||
|
"outputs":f.outputs.iter().enumerate().map(|(i,p)|json!({"index":i,"name":p.param_name,"kind":format!("{:?}",p.kind)})).collect::<Vec<_>>(),
|
||||||
|
"unstable_period":format!("{:?}",f.unst_id), "production_eligible":false,
|
||||||
|
})).collect();
|
||||||
|
json!({"contract":CONTRACT,"parameter_domain_contract":"fidc.indicator-parameter-domain/v1","expression_kernel_sha256":implementation_sha256,"library":{"name":"TA-Lib native Rust","revision":TA_REV,"license":"BSD-3-Clause"},
|
||||||
|
"execution_context_contract":crate::pattern_context::CONTRACT,
|
||||||
|
"execution_context_fields":crate::pattern_context::CONTEXT_FIELDS,
|
||||||
|
"market_event_context_contract":crate::market_event_context::CONTRACT,
|
||||||
|
"market_event_kernel_sha256":crate::market_event_context::implementation_sha256(),
|
||||||
|
"market_event_common_fields":crate::market_event_context::COMMON_FIELDS,
|
||||||
|
"market_event_industry_fields":crate::market_event_context::INDUSTRY_FIELDS,
|
||||||
|
"session_events":crate::session_events::EVENTS,"session_event_contract":crate::session_events::CONTRACT,
|
||||||
|
"indicators":indicators,"operators":OPERATORS,"cross_section_operators":crate::factor_cross_section::OPERATORS,"read_only":true,"live_routing":false,
|
||||||
|
"policies":{"null":"unknown_not_false","warmup":"null_until_full_history","recursive_seed":"frozen_input_start",
|
||||||
|
"breakout":"previous_window_excludes_current","boolean":"three_valued_logic","daily_execution":"next_completed_session",
|
||||||
|
"minute_execution":"strictly_after_completed_bar","cross_section":"requires_separate_complete_universe_contract"}})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn parameter_domain(kind: OptInputType) -> Value {
|
||||||
|
match kind {
|
||||||
|
OptInputType::IntegerRange { min, max, default, .. } => json!({
|
||||||
|
"value_type":"integer", "minimum":min, "maximum":max, "default":default,
|
||||||
|
}),
|
||||||
|
OptInputType::RealRange { min, max, default, precision, .. } => json!({
|
||||||
|
"value_type":"number", "minimum":min, "maximum":max,
|
||||||
|
"default":default, "display_precision":precision,
|
||||||
|
}),
|
||||||
|
OptInputType::IntegerList { values, default } => json!({
|
||||||
|
"value_type":"integer", "default":default,
|
||||||
|
"choices":values.iter().map(|(value,label)|json!({"value":value,"label":label})).collect::<Vec<_>>(),
|
||||||
|
}),
|
||||||
|
OptInputType::RealList { values, default } => json!({
|
||||||
|
"value_type":"number", "default":default,
|
||||||
|
"choices":values.iter().map(|(value,label)|json!({"value":value,"label":label})).collect::<Vec<_>>(),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
//! Causal, typed indicator/event expressions shared by research and trading.
|
//! Causal, typed indicator/event expressions shared by research and trading.
|
||||||
use chrono::{DateTime, FixedOffset};
|
use chrono::{DateTime, FixedOffset};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::{Value, json};
|
use serde_json::Value;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use ta_lib::{
|
use ta_lib::{
|
||||||
Core,
|
Core,
|
||||||
@@ -82,7 +82,7 @@ pub struct Series {
|
|||||||
pub values: Vec<Option<f64>>,
|
pub values: Vec<Option<f64>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const OPERATORS: &[&str] = &[
|
pub(crate) const OPERATORS: &[&str] = &[
|
||||||
"GT",
|
"GT",
|
||||||
"GTE",
|
"GTE",
|
||||||
"LT",
|
"LT",
|
||||||
@@ -168,33 +168,7 @@ const OPERATORS: &[&str] = &[
|
|||||||
"IF",
|
"IF",
|
||||||
];
|
];
|
||||||
|
|
||||||
pub fn catalog() -> Value {
|
pub use crate::factor_event_catalog::catalog;
|
||||||
use sha2::{Digest, Sha256};
|
|
||||||
let mut implementation = Sha256::new();
|
|
||||||
for file in [include_bytes!("factor_events.rs").as_slice(), include_bytes!("factor_cross_section.rs").as_slice(),
|
|
||||||
include_bytes!("daily_patterns.rs").as_slice(),include_bytes!("market_event_context.rs").as_slice(),
|
|
||||||
include_bytes!("session_events.rs").as_slice(),include_bytes!("pattern_context.rs").as_slice(),TA_REV.as_bytes()] {implementation.update(file);}
|
|
||||||
let implementation_sha256=format!("{:x}",implementation.finalize());
|
|
||||||
let indicators: Vec<Value> = abstract_api::funcs().map(|f| json!({
|
|
||||||
"name":f.name, "group":format!("{:?}",f.group), "description":f.hint,
|
|
||||||
"inputs":f.inputs.iter().map(|p|json!({"name":p.param_name,"kind":format!("{:?}",p.kind),"flags":p.flags.0})).collect::<Vec<_>>(),
|
|
||||||
"parameters":f.opt_inputs.iter().map(|p|json!({"name":p.param_name,"label":p.display_name,"description":p.hint,"domain":format!("{:?}",p.kind)})).collect::<Vec<_>>(),
|
|
||||||
"outputs":f.outputs.iter().enumerate().map(|(i,p)|json!({"index":i,"name":p.param_name,"kind":format!("{:?}",p.kind)})).collect::<Vec<_>>(),
|
|
||||||
"unstable_period":format!("{:?}",f.unst_id), "production_eligible":false,
|
|
||||||
})).collect();
|
|
||||||
json!({"contract":CONTRACT,"expression_kernel_sha256":implementation_sha256,"library":{"name":"TA-Lib native Rust","revision":TA_REV,"license":"BSD-3-Clause"},
|
|
||||||
"execution_context_contract":crate::pattern_context::CONTRACT,
|
|
||||||
"execution_context_fields":crate::pattern_context::CONTEXT_FIELDS,
|
|
||||||
"market_event_context_contract":crate::market_event_context::CONTRACT,
|
|
||||||
"market_event_kernel_sha256":crate::market_event_context::implementation_sha256(),
|
|
||||||
"market_event_common_fields":crate::market_event_context::COMMON_FIELDS,
|
|
||||||
"market_event_industry_fields":crate::market_event_context::INDUSTRY_FIELDS,
|
|
||||||
"session_events":crate::session_events::EVENTS,"session_event_contract":crate::session_events::CONTRACT,
|
|
||||||
"indicators":indicators,"operators":OPERATORS,"cross_section_operators":crate::factor_cross_section::OPERATORS,"read_only":true,"live_routing":false,
|
|
||||||
"policies":{"null":"unknown_not_false","warmup":"null_until_full_history","recursive_seed":"frozen_input_start",
|
|
||||||
"breakout":"previous_window_excludes_current","boolean":"three_valued_logic","daily_execution":"next_completed_session",
|
|
||||||
"minute_execution":"strictly_after_completed_bar","cross_section":"requires_separate_complete_universe_contract"}})
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Frame {
|
impl Frame {
|
||||||
pub fn validate(&self) -> Result<(), String> {
|
pub fn validate(&self) -> Result<(), String> {
|
||||||
@@ -958,124 +932,5 @@ fn operator(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
#[path = "factor_events_tests.rs"]
|
||||||
use super::*;
|
mod tests;
|
||||||
fn frame(values: Vec<Option<f64>>) -> Frame {
|
|
||||||
let start = DateTime::parse_from_rfc3339("2026-09-01T15:30:00+08:00").unwrap();
|
|
||||||
let times = (0..values.len())
|
|
||||||
.map(|i| start + chrono::Duration::days(i as i64))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
Frame {
|
|
||||||
symbol: "TEST".into(),
|
|
||||||
frequency: "1d".into(),
|
|
||||||
decision_at: *times.last().unwrap(),
|
|
||||||
available_at: times.clone(),
|
|
||||||
timestamps: times,
|
|
||||||
fields: BTreeMap::from([("close".into(), values)]),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn expr(v: Value) -> Expr {
|
|
||||||
serde_json::from_value(v).unwrap()
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn ta_sma_real_values_and_parameter_validation() {
|
|
||||||
let frame = frame(vec![Some(1.0), Some(2.0), Some(3.0), Some(4.0)]);
|
|
||||||
let e = expr(
|
|
||||||
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"optInTimePeriod":3}}),
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
evaluate(&e, &frame).unwrap().values,
|
|
||||||
vec![None, None, Some(2.0), Some(3.0)]
|
|
||||||
);
|
|
||||||
let bad = expr(
|
|
||||||
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"period":3}}),
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
evaluate(&bad, &frame)
|
|
||||||
.unwrap_err()
|
|
||||||
.contains("parameter_unknown")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn cross_is_event_not_state_and_never_uses_future() {
|
|
||||||
let f = frame(vec![
|
|
||||||
Some(9.0),
|
|
||||||
Some(10.0),
|
|
||||||
Some(11.0),
|
|
||||||
Some(12.0),
|
|
||||||
Some(8.0),
|
|
||||||
]);
|
|
||||||
let e = expr(
|
|
||||||
json!({"kind":"operator","name":"CROSS_ABOVE","args":[{"kind":"field","name":"close"},{"kind":"number","value":10.0}]}),
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
evaluate(&e, &f).unwrap().values,
|
|
||||||
vec![None, Some(0.0), Some(1.0), Some(0.0), Some(0.0)]
|
|
||||||
);
|
|
||||||
let mut invalid = f.clone();
|
|
||||||
invalid.available_at[4] = invalid.decision_at + chrono::Duration::seconds(1);
|
|
||||||
assert!(evaluate(&e, &invalid).is_err());
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn missing_is_not_zero_and_breakout_excludes_current() {
|
|
||||||
let f = frame(vec![Some(1.0), Some(2.0), Some(3.0), None, Some(5.0)]);
|
|
||||||
let e = expr(
|
|
||||||
json!({"kind":"operator","name":"BREAK_HIGH","window":2,"args":[{"kind":"field","name":"close"}]}),
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
evaluate(&e, &f).unwrap().values,
|
|
||||||
vec![None, None, Some(1.0), None, None]
|
|
||||||
);
|
|
||||||
let zero = expr(
|
|
||||||
json!({"kind":"operator","name":"DIV","args":[{"kind":"field","name":"close"},{"kind":"number","value":0}]}),
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
evaluate(&zero, &f)
|
|
||||||
.unwrap()
|
|
||||||
.values
|
|
||||||
.iter()
|
|
||||||
.all(Option::is_none)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn ta_rewarms_after_gap_and_const_zscore_is_unknown() {
|
|
||||||
let f = frame(vec![Some(1.0), Some(1.0), None, Some(2.0), Some(2.0)]);
|
|
||||||
let e = expr(
|
|
||||||
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"optInTimePeriod":2}}),
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
evaluate(&e, &f).unwrap().values,
|
|
||||||
vec![None, Some(1.0), None, None, Some(2.0)]
|
|
||||||
);
|
|
||||||
let e = expr(
|
|
||||||
json!({"kind":"operator","name":"ZSCORE","window":2,"args":[{"kind":"field","name":"close"}]}),
|
|
||||||
);
|
|
||||||
assert!(evaluate(&e, &f).unwrap().values.iter().all(Option::is_none));
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn no_event_has_no_bars_since_and_type_errors_reject() {
|
|
||||||
let f = frame(vec![Some(1.0), Some(1.0), Some(1.0)]);
|
|
||||||
let state = json!({"kind":"operator","name":"GT","args":[{"kind":"field","name":"close"},{"kind":"number","value":5}]});
|
|
||||||
let e = expr(json!({"kind":"operator","name":"BARS_SINCE","args":[state]}));
|
|
||||||
assert!(evaluate(&e, &f).unwrap().values.iter().all(Option::is_none));
|
|
||||||
assert!(
|
|
||||||
evaluate(
|
|
||||||
&expr(
|
|
||||||
json!({"kind":"operator","name":"NOT","args":[{"kind":"field","name":"close"}]})
|
|
||||||
),
|
|
||||||
&f
|
|
||||||
)
|
|
||||||
.is_err()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn literal_unknown_fields_reject_and_catalog_is_not_trading_permission() {
|
|
||||||
assert!(
|
|
||||||
serde_json::from_value::<Expr>(json!({"kind":"number","value":1,"account_id":2}))
|
|
||||||
.is_err()
|
|
||||||
);
|
|
||||||
let c = catalog();
|
|
||||||
assert!(c["indicators"].as_array().unwrap().len() > 190);
|
|
||||||
assert_eq!(c["live_routing"], false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
use super::*;
|
||||||
|
use serde_json::json;
|
||||||
|
use crate::factor_event_catalog::parameter_domain;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn every_parameter_domain_is_structured_and_matches_native_defaults() {
|
||||||
|
for function in abstract_api::funcs() {
|
||||||
|
let handle = abstract_api::get_func_handle(function.name).unwrap();
|
||||||
|
let core = Core::new();
|
||||||
|
let mut call = handle.new_call(&core);
|
||||||
|
for (index, parameter) in function.opt_inputs.iter().enumerate() {
|
||||||
|
let domain = parameter_domain(parameter.kind);
|
||||||
|
let default = domain["default"].as_f64().unwrap();
|
||||||
|
assert!(default.is_finite(), "{} {}", function.name, parameter.param_name);
|
||||||
|
if let Some(choices) = domain.get("choices") {
|
||||||
|
assert!(choices.as_array().unwrap().iter().any(|v| v["value"].as_f64() == Some(default)));
|
||||||
|
} else {
|
||||||
|
assert!(default >= domain["minimum"].as_f64().unwrap());
|
||||||
|
assert!(default <= domain["maximum"].as_f64().unwrap());
|
||||||
|
}
|
||||||
|
if domain["value_type"] == "integer" {
|
||||||
|
assert_eq!(default.fract(), 0.0);
|
||||||
|
call.set_opt(index, default as i32).unwrap();
|
||||||
|
} else {
|
||||||
|
call.set_opt(index, default).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert!(call.lookback().is_ok(), "{}", function.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parameter_domains_keep_enumeration_labels_without_debug_string_parsing() {
|
||||||
|
let catalog = catalog();
|
||||||
|
assert_eq!(catalog["parameter_domain_contract"], "fidc.indicator-parameter-domain/v1");
|
||||||
|
let indicators = catalog["indicators"].as_array().unwrap();
|
||||||
|
let rsi = indicators.iter().find(|v| v["name"] == "RSI").unwrap();
|
||||||
|
assert_eq!(rsi["parameters"][0]["domain"]["minimum"], 2);
|
||||||
|
let stoch = indicators.iter().find(|v| v["name"] == "STOCH").unwrap();
|
||||||
|
let ma_type = stoch["parameters"].as_array().unwrap().iter().find(|p| p["name"] == "optInSlowK_MAType").unwrap();
|
||||||
|
assert!(ma_type["domain"]["choices"].as_array().unwrap().iter().any(|v| v["label"] == "EMA" && v["value"] == 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn frame(values: Vec<Option<f64>>) -> Frame {
|
||||||
|
let start = DateTime::parse_from_rfc3339("2026-09-01T15:30:00+08:00").unwrap();
|
||||||
|
let times = (0..values.len())
|
||||||
|
.map(|i| start + chrono::Duration::days(i as i64))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
Frame {
|
||||||
|
symbol: "TEST".into(),
|
||||||
|
frequency: "1d".into(),
|
||||||
|
decision_at: *times.last().unwrap(),
|
||||||
|
available_at: times.clone(),
|
||||||
|
timestamps: times,
|
||||||
|
fields: BTreeMap::from([("close".into(), values)]),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn expr(v: Value) -> Expr {
|
||||||
|
serde_json::from_value(v).unwrap()
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn ta_sma_real_values_and_parameter_validation() {
|
||||||
|
let frame = frame(vec![Some(1.0), Some(2.0), Some(3.0), Some(4.0)]);
|
||||||
|
let e = expr(
|
||||||
|
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"optInTimePeriod":3}}),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
evaluate(&e, &frame).unwrap().values,
|
||||||
|
vec![None, None, Some(2.0), Some(3.0)]
|
||||||
|
);
|
||||||
|
let bad = expr(
|
||||||
|
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"period":3}}),
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
evaluate(&bad, &frame)
|
||||||
|
.unwrap_err()
|
||||||
|
.contains("parameter_unknown")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn cross_is_event_not_state_and_never_uses_future() {
|
||||||
|
let f = frame(vec![
|
||||||
|
Some(9.0),
|
||||||
|
Some(10.0),
|
||||||
|
Some(11.0),
|
||||||
|
Some(12.0),
|
||||||
|
Some(8.0),
|
||||||
|
]);
|
||||||
|
let e = expr(
|
||||||
|
json!({"kind":"operator","name":"CROSS_ABOVE","args":[{"kind":"field","name":"close"},{"kind":"number","value":10.0}]}),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
evaluate(&e, &f).unwrap().values,
|
||||||
|
vec![None, Some(0.0), Some(1.0), Some(0.0), Some(0.0)]
|
||||||
|
);
|
||||||
|
let mut invalid = f.clone();
|
||||||
|
invalid.available_at[4] = invalid.decision_at + chrono::Duration::seconds(1);
|
||||||
|
assert!(evaluate(&e, &invalid).is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn missing_is_not_zero_and_breakout_excludes_current() {
|
||||||
|
let f = frame(vec![Some(1.0), Some(2.0), Some(3.0), None, Some(5.0)]);
|
||||||
|
let e = expr(
|
||||||
|
json!({"kind":"operator","name":"BREAK_HIGH","window":2,"args":[{"kind":"field","name":"close"}]}),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
evaluate(&e, &f).unwrap().values,
|
||||||
|
vec![None, None, Some(1.0), None, None]
|
||||||
|
);
|
||||||
|
let zero = expr(
|
||||||
|
json!({"kind":"operator","name":"DIV","args":[{"kind":"field","name":"close"},{"kind":"number","value":0}]}),
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
evaluate(&zero, &f)
|
||||||
|
.unwrap()
|
||||||
|
.values
|
||||||
|
.iter()
|
||||||
|
.all(Option::is_none)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn ta_rewarms_after_gap_and_const_zscore_is_unknown() {
|
||||||
|
let f = frame(vec![Some(1.0), Some(1.0), None, Some(2.0), Some(2.0)]);
|
||||||
|
let e = expr(
|
||||||
|
json!({"kind":"indicator","name":"SMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"optInTimePeriod":2}}),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
evaluate(&e, &f).unwrap().values,
|
||||||
|
vec![None, Some(1.0), None, None, Some(2.0)]
|
||||||
|
);
|
||||||
|
let e = expr(
|
||||||
|
json!({"kind":"operator","name":"ZSCORE","window":2,"args":[{"kind":"field","name":"close"}]}),
|
||||||
|
);
|
||||||
|
assert!(evaluate(&e, &f).unwrap().values.iter().all(Option::is_none));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn no_event_has_no_bars_since_and_type_errors_reject() {
|
||||||
|
let f = frame(vec![Some(1.0), Some(1.0), Some(1.0)]);
|
||||||
|
let state = json!({"kind":"operator","name":"GT","args":[{"kind":"field","name":"close"},{"kind":"number","value":5}]});
|
||||||
|
let e = expr(json!({"kind":"operator","name":"BARS_SINCE","args":[state]}));
|
||||||
|
assert!(evaluate(&e, &f).unwrap().values.iter().all(Option::is_none));
|
||||||
|
assert!(
|
||||||
|
evaluate(
|
||||||
|
&expr(
|
||||||
|
json!({"kind":"operator","name":"NOT","args":[{"kind":"field","name":"close"}]})
|
||||||
|
),
|
||||||
|
&f
|
||||||
|
)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn literal_unknown_fields_reject_and_catalog_is_not_trading_permission() {
|
||||||
|
assert!(
|
||||||
|
serde_json::from_value::<Expr>(json!({"kind":"number","value":1,"account_id":2}))
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
let c = catalog();
|
||||||
|
assert!(c["indicators"].as_array().unwrap().len() > 190);
|
||||||
|
assert_eq!(c["live_routing"], false);
|
||||||
|
}
|
||||||
@@ -27,6 +27,12 @@ pub struct Instrument {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Instrument {
|
impl Instrument {
|
||||||
|
/// Classification from the admitted security master, never a code prefix
|
||||||
|
/// or a name substring. This does not grant T+0 settlement eligibility.
|
||||||
|
pub fn is_exchange_traded_fund(&self) -> bool {
|
||||||
|
matches!(self.board.trim().to_ascii_uppercase().as_str(), "ETF" | "EXCHANGE_TRADED_FUND")
|
||||||
|
}
|
||||||
|
|
||||||
pub fn effective_round_lot(&self) -> u32 {
|
pub fn effective_round_lot(&self) -> u32 {
|
||||||
self.round_lot.max(1)
|
self.round_lot.max(1)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ pub mod daily_patterns;
|
|||||||
pub mod pattern_context;
|
pub mod pattern_context;
|
||||||
pub mod session_events;
|
pub mod session_events;
|
||||||
pub mod factor_events;
|
pub mod factor_events;
|
||||||
|
pub mod execution_capacity;
|
||||||
|
mod execution_schedule;
|
||||||
|
mod factor_event_catalog;
|
||||||
pub mod factor_cross_section;
|
pub mod factor_cross_section;
|
||||||
pub mod market_event_context;
|
pub mod market_event_context;
|
||||||
pub mod engine;
|
pub mod engine;
|
||||||
@@ -26,6 +29,12 @@ pub mod rules;
|
|||||||
pub mod scheduler;
|
pub mod scheduler;
|
||||||
pub mod strategy;
|
pub mod strategy;
|
||||||
pub mod holding_policy;
|
pub mod holding_policy;
|
||||||
|
pub mod stock_pool_candidates;
|
||||||
|
pub mod stock_pool_indicators;
|
||||||
|
pub mod stock_pool_execution;
|
||||||
|
pub mod stock_pool_index_policy;
|
||||||
|
pub mod stock_pool_market_cap;
|
||||||
|
pub mod stock_pool_state;
|
||||||
pub mod signal_contract;
|
pub mod signal_contract;
|
||||||
pub mod strategy_ai;
|
pub mod strategy_ai;
|
||||||
pub mod universe;
|
pub mod universe;
|
||||||
|
|||||||
@@ -558,7 +558,9 @@ fn alpha_beta(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn drawdown_stats(nav: &[f64]) -> (f64, usize) {
|
fn drawdown_stats(nav: &[f64]) -> (f64, usize) {
|
||||||
let mut peak = 0.0_f64;
|
// NAV is measured against the pre-period capital. The first real loss
|
||||||
|
// must not become a new zero-drawdown baseline.
|
||||||
|
let mut peak = 1.0_f64;
|
||||||
let mut max_drawdown = 0.0_f64;
|
let mut max_drawdown = 0.0_f64;
|
||||||
let mut duration = 0_usize;
|
let mut duration = 0_usize;
|
||||||
let mut max_duration = 0_usize;
|
let mut max_duration = 0_usize;
|
||||||
@@ -767,6 +769,28 @@ fn safe_div(numerator: f64, denominator: f64, fallback: f64) -> f64 {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn drawdown_includes_initial_nav_without_adding_a_trading_day() {
|
||||||
|
let (drawdown, duration) = drawdown_stats(&[0.9, 0.99]);
|
||||||
|
assert!((drawdown + 0.1).abs() < 1e-12);
|
||||||
|
assert_eq!(duration, 2);
|
||||||
|
assert_eq!(drawdown_stats(&[1.0, 1.1, 1.1]), (0.0, 0));
|
||||||
|
assert_eq!(drawdown_stats(&[0.0]), (-1.0, 1));
|
||||||
|
assert_eq!(drawdown_stats(&[]), (0.0, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn first_day_loss_is_preserved_in_shared_backtest_metrics() {
|
||||||
|
let curve = vec![
|
||||||
|
equity_point("2025-01-03", 99.16648349337, 98.81608059815, 100.0),
|
||||||
|
equity_point("2025-01-06", 99.68551588547, 98.65392198168, 98.81608059815),
|
||||||
|
];
|
||||||
|
let metrics = compute_backtest_metrics(&curve, &[], &[], &[], 100.0, None).unwrap();
|
||||||
|
assert!((metrics.max_drawdown + 0.0083351650663).abs() < 1e-12);
|
||||||
|
assert_eq!(metrics.total_trade_days, 2);
|
||||||
|
assert_eq!(metrics.max_drawdown_duration_days, 2);
|
||||||
|
}
|
||||||
|
|
||||||
fn equity_point(
|
fn equity_point(
|
||||||
date: &str,
|
date: &str,
|
||||||
total_equity: f64,
|
total_equity: f64,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,236 @@
|
|||||||
|
//! Stock pools emit one frozen framework intent, not a lossy code-strategy translation.
|
||||||
|
use super::*;
|
||||||
|
use crate::stock_pool_execution as pool;
|
||||||
|
use rust_decimal::Decimal;
|
||||||
|
|
||||||
|
impl PlatformExprStrategy {
|
||||||
|
pub(super) fn stock_pool_decision(
|
||||||
|
&mut self,
|
||||||
|
ctx: &StrategyContext<'_>,
|
||||||
|
) -> Result<StrategyDecision, BacktestError> {
|
||||||
|
let program = self
|
||||||
|
.config
|
||||||
|
.stock_pool
|
||||||
|
.as_ref()
|
||||||
|
.ok_or_else(|| BacktestError::Execution("stock_pool_program_missing".into()))?
|
||||||
|
.clone();
|
||||||
|
let mut constraints = pool::stock_pool_constraints_from_configuration(
|
||||||
|
&program.allocation_policy,
|
||||||
|
&program.stop_take_policy,
|
||||||
|
)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
if let Some(policy) = constraints
|
||||||
|
.market_timing_policy
|
||||||
|
.as_ref()
|
||||||
|
.filter(|policy| policy.enabled)
|
||||||
|
{
|
||||||
|
let before_close = !ctx.is_lagged_execution()
|
||||||
|
&& ctx
|
||||||
|
.active_datetime
|
||||||
|
.is_some_and(|at| at.time() < NaiveTime::from_hms_opt(15, 0, 0).unwrap());
|
||||||
|
let as_of = if before_close {
|
||||||
|
ctx.data
|
||||||
|
.previous_trading_date(ctx.decision_date, 1)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
BacktestError::Execution(
|
||||||
|
"market_timing_previous_completed_session_missing".into(),
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
} else {
|
||||||
|
ctx.decision_date
|
||||||
|
};
|
||||||
|
let required = policy
|
||||||
|
.required_history()
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
let mut dates = ctx
|
||||||
|
.data
|
||||||
|
.calendar()
|
||||||
|
.iter()
|
||||||
|
.filter(|date| *date <= as_of)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
if dates.len() < required {
|
||||||
|
return Err(BacktestError::Execution(format!(
|
||||||
|
"market_timing_official_calendar_incomplete:required={required}:available={}",
|
||||||
|
dates.len()
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
dates = dates.split_off(dates.len() - required);
|
||||||
|
let index = policy.index_code.as_ref().expect("validated index policy");
|
||||||
|
let closes = dates
|
||||||
|
.iter()
|
||||||
|
.map(|date| {
|
||||||
|
let row = ctx.data.market(*date, index).ok_or_else(|| {
|
||||||
|
BacktestError::Execution(format!(
|
||||||
|
"market_timing_completed_index_row_missing:{index}:{date}"
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
Ok(crate::stock_pool_index_policy::IndexClose {
|
||||||
|
date: *date,
|
||||||
|
close: row.close,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<Result<Vec<_>, BacktestError>>()?;
|
||||||
|
constraints.market_timing_input =
|
||||||
|
Some(crate::stock_pool_index_policy::MarketTimingInput {
|
||||||
|
index_code: index.clone(),
|
||||||
|
as_of_date: as_of,
|
||||||
|
official_dates: dates,
|
||||||
|
closes,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let rule = pool::normalize_stock_pool_execution_rule(
|
||||||
|
Some(&program.timing_policy),
|
||||||
|
!self.config.buy_filter_expr.trim().is_empty(),
|
||||||
|
!self.config.stop_loss_expr.trim().is_empty()
|
||||||
|
|| !self.config.take_profit_expr.trim().is_empty()
|
||||||
|
|| !self.config.position_target_rules.is_empty(),
|
||||||
|
)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
if self.config.in_skip_window(ctx.decision_date) {
|
||||||
|
return Ok(StrategyDecision::default());
|
||||||
|
}
|
||||||
|
let day = self.day_state(ctx, ctx.decision_date)?;
|
||||||
|
let (market_date, universe_date, factor_date) = self.selection_dates(ctx);
|
||||||
|
let (low, high) = self.market_cap_band(ctx, &day)?;
|
||||||
|
let (ranked, mut diagnostics, risk_decisions) = self.select_symbols(
|
||||||
|
ctx,
|
||||||
|
market_date,
|
||||||
|
universe_date,
|
||||||
|
factor_date,
|
||||||
|
&day,
|
||||||
|
low,
|
||||||
|
high,
|
||||||
|
usize::MAX,
|
||||||
|
)?;
|
||||||
|
let held = ctx
|
||||||
|
.portfolio
|
||||||
|
.positions()
|
||||||
|
.values()
|
||||||
|
.filter(|p| p.quantity > 0)
|
||||||
|
.map(|p| p.symbol.clone())
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
if !self.config.buy_filter_expr.trim().is_empty() {
|
||||||
|
for symbol in &ranked {
|
||||||
|
let stock =
|
||||||
|
self.stock_state_with_factor_date(ctx, market_date, factor_date, symbol)?;
|
||||||
|
if !self.eval_bool(ctx, &self.config.buy_filter_expr, &day, Some(&stock), None)? {
|
||||||
|
constraints
|
||||||
|
.buy_denials
|
||||||
|
.insert(symbol.clone(), vec!["frozen_buy_condition_not_met".into()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let native_exits = self.current_stop_take_exit_symbols(ctx, ctx.decision_date, &day)?;
|
||||||
|
for symbol in native_exits {
|
||||||
|
constraints.position_target_bps.insert(symbol, 0);
|
||||||
|
}
|
||||||
|
for (symbol, (bps, _)) in
|
||||||
|
self.current_position_target_rules(ctx, ctx.decision_date, factor_date, &day)?
|
||||||
|
{
|
||||||
|
constraints
|
||||||
|
.position_target_bps
|
||||||
|
.entry(symbol)
|
||||||
|
.and_modify(|old| *old = (*old).min(bps))
|
||||||
|
.or_insert(bps);
|
||||||
|
}
|
||||||
|
let limit = constraints.target_holding_count.unwrap_or(ranked.len());
|
||||||
|
let final_symbols = ranked
|
||||||
|
.iter()
|
||||||
|
.filter(|symbol| !constraints.position_target_bps.contains_key(*symbol))
|
||||||
|
.take(limit)
|
||||||
|
.cloned()
|
||||||
|
.collect();
|
||||||
|
let generation = format!(
|
||||||
|
"stock-pool:{}:{}:{}",
|
||||||
|
program.pool_id,
|
||||||
|
program.version_id,
|
||||||
|
ctx.active_datetime
|
||||||
|
.map(|date| date.to_string())
|
||||||
|
.unwrap_or_else(|| ctx.decision_date.to_string())
|
||||||
|
);
|
||||||
|
let selection = pool::StockPoolSelection {
|
||||||
|
trade_date: ctx.decision_date,
|
||||||
|
requested_symbols: ranked.clone(),
|
||||||
|
normal_trading_symbols: ranked.clone(),
|
||||||
|
risk_eligible_symbols: ranked.clone(),
|
||||||
|
final_symbols,
|
||||||
|
exclusion_reasons: BTreeMap::new(),
|
||||||
|
inherited_from_generation: None,
|
||||||
|
explicit_empty: program.members.is_empty()
|
||||||
|
&& self.config.candidate_symbols_by_date.is_empty(),
|
||||||
|
generation: Some(generation.clone()),
|
||||||
|
};
|
||||||
|
let by_symbol = program
|
||||||
|
.members
|
||||||
|
.iter()
|
||||||
|
.map(|member| (member.symbol.as_str(), member))
|
||||||
|
.collect::<BTreeMap<_, _>>();
|
||||||
|
let mut scope = ranked.clone();
|
||||||
|
// Kept rules are execution metadata, not additional selection candidates.
|
||||||
|
for symbol in held {
|
||||||
|
if by_symbol.contains_key(symbol.as_str()) && !scope.contains(&symbol) {
|
||||||
|
scope.push(symbol)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let members = scope
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(index, symbol)| {
|
||||||
|
let mut member = by_symbol
|
||||||
|
.get(symbol.as_str())
|
||||||
|
.map(|member| (*member).clone())
|
||||||
|
.unwrap_or_else(|| pool::StockPoolMemberSpec {
|
||||||
|
symbol: symbol.clone(),
|
||||||
|
requested_order: index as i32,
|
||||||
|
recommendation_reason: String::new(),
|
||||||
|
target_weight_bps: None,
|
||||||
|
stop_loss: constraints.default_stop_loss,
|
||||||
|
take_profit: constraints.default_take_profit,
|
||||||
|
});
|
||||||
|
member.requested_order = index as i32;
|
||||||
|
member
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let (base_ratio, reserve_cash) =
|
||||||
|
pool::stock_pool_funding_from_configuration(&program.allocation_policy)
|
||||||
|
.map_err(BacktestError::Execution)?;
|
||||||
|
let ratio = self
|
||||||
|
.config
|
||||||
|
.position_exposure_schedule
|
||||||
|
.range(..=ctx.decision_date)
|
||||||
|
.next_back()
|
||||||
|
.map(|(_, value)| (*value * 10000.).round() as i64)
|
||||||
|
.unwrap_or(i64::from(base_ratio));
|
||||||
|
let invest_ratio_bps = i32::try_from(ratio)
|
||||||
|
.ok()
|
||||||
|
.filter(|ratio| (0..=10000).contains(ratio))
|
||||||
|
.ok_or_else(|| BacktestError::Execution("stock_pool_invest_ratio_invalid".into()))?;
|
||||||
|
let signal_equity =
|
||||||
|
self.signal_visible_total_value(ctx, ctx.decision_date, ctx.is_lagged_execution());
|
||||||
|
let frozen_equity = signal_equity
|
||||||
|
.to_string()
|
||||||
|
.parse::<Decimal>()
|
||||||
|
.map_err(|_| BacktestError::Execution("stock_pool_signal_equity_invalid".into()))?;
|
||||||
|
diagnostics.push(format!("stock_pool_signal_frozen generation={generation} candidate_count={} frozen_equity={frozen_equity}",ranked.len()));
|
||||||
|
Ok(StrategyDecision {
|
||||||
|
order_intents: vec![OrderIntent::StockPool {
|
||||||
|
contract: Box::new(pool::FrozenStockPoolIntent {
|
||||||
|
pool_id:program.pool_id.clone(),
|
||||||
|
signal_date: ctx.decision_date,
|
||||||
|
frozen_equity,
|
||||||
|
selection,
|
||||||
|
members,
|
||||||
|
rule,
|
||||||
|
constraints,
|
||||||
|
invest_ratio_bps,
|
||||||
|
reserve_cash,
|
||||||
|
out_of_pool_policy: program.out_of_pool_policy,
|
||||||
|
generation,
|
||||||
|
}),
|
||||||
|
}],
|
||||||
|
diagnostics,
|
||||||
|
risk_decisions,
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,8 @@ use crate::{
|
|||||||
#[derive(Debug, Clone, Default, Deserialize, Serialize)]
|
#[derive(Debug, Clone, Default, Deserialize, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct StrategyRuntimeSpec {
|
pub struct StrategyRuntimeSpec {
|
||||||
|
#[serde(default,alias="stock_pool")]
|
||||||
|
pub stock_pool:Option<crate::stock_pool_execution::StockPoolProgram>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub signal_book: Option<crate::signal_contract::SignalBook>,
|
pub signal_book: Option<crate::signal_contract::SignalBook>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -912,6 +914,10 @@ pub struct StrategyExpressionSelectionConfig {
|
|||||||
pub current_day_precomputed_factors: Option<bool>,
|
pub current_day_precomputed_factors: Option<bool>,
|
||||||
#[serde(default, alias = "candidate_symbols_by_date")]
|
#[serde(default, alias = "candidate_symbols_by_date")]
|
||||||
pub candidate_symbols_by_date: BTreeMap<String, Vec<String>>,
|
pub candidate_symbols_by_date: BTreeMap<String, Vec<String>>,
|
||||||
|
#[serde(default, alias = "preserve_candidate_order")]
|
||||||
|
pub preserve_candidate_order: bool,
|
||||||
|
#[serde(default, alias = "candidate_source_book")]
|
||||||
|
pub candidate_source_book: Option<crate::stock_pool_candidates::CandidateSourceBook>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, Deserialize, Serialize)]
|
#[derive(Debug, Clone, Default, Deserialize, Serialize)]
|
||||||
@@ -1528,7 +1534,6 @@ fn normalize_slippage_model_name(value: &str) -> String {
|
|||||||
| "price_rate"
|
| "price_rate"
|
||||||
| "price_ratio_slippage"
|
| "price_ratio_slippage"
|
||||||
| "priceratioslippage" => "price_ratio".to_string(),
|
| "priceratioslippage" => "price_ratio".to_string(),
|
||||||
"dynamic_volume_volatility" => "dynamic".to_string(),
|
|
||||||
other => other.to_string(),
|
other => other.to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1573,11 +1578,13 @@ fn parse_slippage_model(
|
|||||||
impact_coefficient: Option<f64>,
|
impact_coefficient: Option<f64>,
|
||||||
volatility_coefficient: Option<f64>,
|
volatility_coefficient: Option<f64>,
|
||||||
max_value: Option<f64>,
|
max_value: Option<f64>,
|
||||||
) -> Option<SlippageModel> {
|
) -> Result<SlippageModel, String> {
|
||||||
let value = valid_non_negative(value);
|
for (name, parameter) in [("slippageValue", value), ("slippageImpactCoefficient", impact_coefficient),
|
||||||
let impact_coefficient = valid_non_negative(impact_coefficient);
|
("slippageVolatilityCoefficient", volatility_coefficient), ("slippageMaxValue", max_value)] {
|
||||||
let volatility_coefficient = valid_non_negative(volatility_coefficient);
|
if parameter.is_some_and(|number| !number.is_finite() || number < 0.0) {
|
||||||
let max_value = valid_non_negative(max_value);
|
return Err(format!("{name} must be finite and non-negative"));
|
||||||
|
}
|
||||||
|
}
|
||||||
let model = model
|
let model = model
|
||||||
.map(normalize_slippage_model_name)
|
.map(normalize_slippage_model_name)
|
||||||
.filter(|item| !item.is_empty())
|
.filter(|item| !item.is_empty())
|
||||||
@@ -1590,16 +1597,23 @@ fn parse_slippage_model(
|
|||||||
});
|
});
|
||||||
|
|
||||||
match model.as_str() {
|
match model.as_str() {
|
||||||
"none" => Some(SlippageModel::None),
|
"none" => Ok(SlippageModel::None),
|
||||||
"price_ratio" => Some(SlippageModel::PriceRatio(value.unwrap_or(0.0))),
|
"price_ratio" => Ok(SlippageModel::PriceRatio(value.unwrap_or(0.0))),
|
||||||
"tick_size" => Some(SlippageModel::TickSize(value.unwrap_or(0.0))),
|
"tick_size" => Ok(SlippageModel::TickSize(value.unwrap_or(0.0))),
|
||||||
"limit_price" => Some(SlippageModel::LimitPrice),
|
"limit_price" => Ok(SlippageModel::LimitPrice),
|
||||||
"dynamic" => Some(SlippageModel::Dynamic(DynamicSlippageConfig::new(
|
"historical_volume_volatility" => {
|
||||||
impact_coefficient.unwrap_or(0.5),
|
let max_ratio = max_value.or(value).unwrap_or(0.01);
|
||||||
volatility_coefficient.unwrap_or(0.3),
|
if max_ratio >= 1.0 {
|
||||||
max_value.or(value).unwrap_or(0.01),
|
return Err("historical slippage maximum must be less than 1".into());
|
||||||
))),
|
}
|
||||||
_ => None,
|
Ok(SlippageModel::HistoricalVolumeVolatility(DynamicSlippageConfig::new(
|
||||||
|
impact_coefficient.unwrap_or(0.5), volatility_coefficient.unwrap_or(0.3), max_ratio,
|
||||||
|
)))
|
||||||
|
},
|
||||||
|
"dynamic" | "dynamic_volume_volatility" => Err(
|
||||||
|
"retired_slippage_model: dynamic used unfinished daily data; explicitly select historical_volume_volatility or another supported model".into()
|
||||||
|
),
|
||||||
|
_ => Err(format!("unsupported slippageModel: {model}")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1630,20 +1644,19 @@ fn apply_execution_behavior_overrides(
|
|||||||
|| slippage_volatility_coefficient.is_some()
|
|| slippage_volatility_coefficient.is_some()
|
||||||
|| slippage_max_value.is_some()
|
|| slippage_max_value.is_some()
|
||||||
{
|
{
|
||||||
if let Some(parsed) = parse_slippage_model(
|
cfg.slippage_model = parse_slippage_model(
|
||||||
slippage_model,
|
slippage_model,
|
||||||
slippage_value,
|
slippage_value,
|
||||||
slippage_impact_coefficient,
|
slippage_impact_coefficient,
|
||||||
slippage_volatility_coefficient,
|
slippage_volatility_coefficient,
|
||||||
slippage_max_value,
|
slippage_max_value,
|
||||||
) {
|
)?;
|
||||||
cfg.slippage_model = parsed;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if strict_value_budget == Some(false) {
|
if strict_value_budget == Some(false) {
|
||||||
return Err("strictValueBudget=false is not supported".to_string());
|
return Err("strictValueBudget=false is not supported".to_string());
|
||||||
}
|
}
|
||||||
cfg.strict_value_budget = true;
|
cfg.strict_value_budget = true;
|
||||||
|
|
||||||
if let Some(rate) = sell_then_buy_delay_slippage_rate {
|
if let Some(rate) = sell_then_buy_delay_slippage_rate {
|
||||||
if !rate.is_finite() || !(0.0..1.0).contains(&rate) {
|
if !rate.is_finite() || !(0.0..1.0).contains(&rate) {
|
||||||
return Err(
|
return Err(
|
||||||
@@ -2127,12 +2140,29 @@ pub fn platform_expr_config_from_spec(
|
|||||||
if let Some(enabled) = selection.current_day_precomputed_factors {
|
if let Some(enabled) = selection.current_day_precomputed_factors {
|
||||||
cfg.current_day_precomputed_factors = enabled;
|
cfg.current_day_precomputed_factors = enabled;
|
||||||
}
|
}
|
||||||
|
if selection.preserve_candidate_order && selection.candidate_symbols_by_date.is_empty() {
|
||||||
|
return Err("preserveCandidateOrder requires a dated candidate book".to_string());
|
||||||
|
}
|
||||||
|
if let Some(book) = &selection.candidate_source_book {
|
||||||
|
if !selection.preserve_candidate_order {
|
||||||
|
return Err("candidateSourceBook requires preserveCandidateOrder=true".into());
|
||||||
|
}
|
||||||
|
let expected = book.resolved_symbols()?.into_iter()
|
||||||
|
.map(|(date, symbols)| (date.to_string(), symbols)).collect::<BTreeMap<_, _>>();
|
||||||
|
if expected != selection.candidate_symbols_by_date {
|
||||||
|
return Err("candidateSourceBook differs from resolved candidateSymbolsByDate".into());
|
||||||
|
}
|
||||||
|
if cfg.selection_limit_expr.trim() == "pool_candidate_count" {
|
||||||
|
cfg.max_positions = expected.values().map(Vec::len).max().unwrap_or(0).max(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
for (raw_date, raw_symbols) in &selection.candidate_symbols_by_date {
|
for (raw_date, raw_symbols) in &selection.candidate_symbols_by_date {
|
||||||
let trade_date = NaiveDate::parse_from_str(raw_date, "%Y-%m-%d").map_err(|_| {
|
let trade_date = NaiveDate::parse_from_str(raw_date, "%Y-%m-%d").map_err(|_| {
|
||||||
format!("candidateSymbolsByDate contains invalid date: {raw_date}")
|
format!("candidateSymbolsByDate contains invalid date: {raw_date}")
|
||||||
})?;
|
})?;
|
||||||
let mut symbols = BTreeSet::new();
|
let mut symbols = BTreeSet::new();
|
||||||
for raw_symbol in raw_symbols {
|
let mut order = BTreeMap::new();
|
||||||
|
for (index, raw_symbol) in raw_symbols.iter().enumerate() {
|
||||||
let symbol = normalize_symbol(raw_symbol, None);
|
let symbol = normalize_symbol(raw_symbol, None);
|
||||||
let valid = symbol.rsplit_once('.').is_some_and(|(code, exchange)| {
|
let valid = symbol.rsplit_once('.').is_some_and(|(code, exchange)| {
|
||||||
code.len() == 6
|
code.len() == 6
|
||||||
@@ -2149,8 +2179,12 @@ pub fn platform_expr_config_from_spec(
|
|||||||
"candidateSymbolsByDate contains duplicate date/symbol: {raw_date} {symbol}"
|
"candidateSymbolsByDate contains duplicate date/symbol: {raw_date} {symbol}"
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
order.insert(symbol, index);
|
||||||
}
|
}
|
||||||
cfg.candidate_symbols_by_date.insert(trade_date, symbols);
|
cfg.candidate_symbols_by_date.insert(trade_date, symbols);
|
||||||
|
if selection.preserve_candidate_order {
|
||||||
|
cfg.candidate_order_by_date.insert(trade_date, order);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(allocation) = runtime_expr.allocation.as_ref()
|
if let Some(allocation) = runtime_expr.allocation.as_ref()
|
||||||
@@ -2620,6 +2654,12 @@ pub fn platform_expr_config_from_spec(
|
|||||||
}
|
}
|
||||||
cfg.strict_value_budget = true;
|
cfg.strict_value_budget = true;
|
||||||
|
|
||||||
|
if spec.runtime_expressions.as_ref().and_then(|runtime| runtime.selection.as_ref())
|
||||||
|
.is_some_and(|selection| selection.candidate_source_book.is_some())
|
||||||
|
&& (cfg.matching_type != MatchingType::NextBarOpen || !cfg.current_day_precomputed_factors) {
|
||||||
|
return Err("daily candidate source book requires completed signal-day factors and next_bar_open".into());
|
||||||
|
}
|
||||||
|
|
||||||
let signal_book = match (&spec.signal_book,&spec.signal_book_ref) {
|
let signal_book = match (&spec.signal_book,&spec.signal_book_ref) {
|
||||||
(Some(_),Some(_)) => return Err("inline_and_registered_signal_book_are_mutually_exclusive".into()),
|
(Some(_),Some(_)) => return Err("inline_and_registered_signal_book_are_mutually_exclusive".into()),
|
||||||
(Some(raw),None) => Some(std::sync::Arc::new(raw.clone().validate()?)),
|
(Some(raw),None) => Some(std::sync::Arc::new(raw.clone().validate()?)),
|
||||||
@@ -2654,6 +2694,17 @@ pub fn platform_expr_config_from_spec(
|
|||||||
}
|
}
|
||||||
cfg.max_holding_days = (limit > 0).then_some(limit);
|
cfg.max_holding_days = (limit > 0).then_some(limit);
|
||||||
}
|
}
|
||||||
|
if let Some(pool)=&spec.stock_pool {
|
||||||
|
if cfg.signal_book.is_some() || spec.signal_book_ref.is_some() || !cfg.explicit_actions.is_empty(){return Err("stock_pool_program_cannot_mix_other_order_programs".into())}
|
||||||
|
let secondary_buy=!cfg.buy_filter_expr.trim().is_empty();
|
||||||
|
let secondary_sell=spec.runtime_expressions.as_ref().and_then(|runtime|runtime.risk.as_ref()).is_some_and(|risk|risk.stop_loss_expr.is_some()||risk.take_profit_expr.is_some()) || !cfg.position_target_rules.is_empty();
|
||||||
|
pool.validate(secondary_buy,secondary_sell)?;
|
||||||
|
cfg.stock_pool=Some(pool.clone());
|
||||||
|
cfg.hold_until_exit_enabled=false;
|
||||||
|
cfg.daily_top_up_enabled=false;
|
||||||
|
cfg.daily_position_target_adjust_enabled=false;
|
||||||
|
cfg.target_portfolio_daily_enabled=false;
|
||||||
|
}
|
||||||
Ok(cfg)
|
Ok(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3329,6 +3380,25 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn frozen_candidate_order_is_explicit_and_preserves_source_positions() {
|
||||||
|
let mut spec = serde_json::json!({"runtimeExpressions": {"selection": {
|
||||||
|
"candidateSymbolsByDate": {
|
||||||
|
"2025-01-02": ["600000.SH", "000001.SZ"], "2025-01-03": []
|
||||||
|
}
|
||||||
|
}}});
|
||||||
|
let date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
|
||||||
|
let legacy = platform_expr_config_from_value("", "", &spec).unwrap();
|
||||||
|
assert!(legacy.candidate_order_by_date.is_empty());
|
||||||
|
spec["runtimeExpressions"]["selection"]["preserveCandidateOrder"] = serde_json::json!(true);
|
||||||
|
let ordered = platform_expr_config_from_value("", "", &spec).unwrap();
|
||||||
|
assert_eq!(ordered.candidate_order_by_date[&date]["600000.SH"], 0);
|
||||||
|
assert_eq!(ordered.candidate_order_by_date[&date]["000001.SZ"], 1);
|
||||||
|
assert!(ordered.candidate_order_by_date[&NaiveDate::from_ymd_opt(2025, 1, 3).unwrap()].is_empty());
|
||||||
|
spec["runtimeExpressions"]["selection"]["candidateSymbolsByDate"] = serde_json::json!({});
|
||||||
|
assert!(platform_expr_config_from_value("", "", &spec).unwrap_err().to_string().contains("dated candidate book"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn rejects_invalid_or_duplicate_static_universe_symbols() {
|
fn rejects_invalid_or_duplicate_static_universe_symbols() {
|
||||||
let invalid = serde_json::json!({
|
let invalid = serde_json::json!({
|
||||||
@@ -4337,10 +4407,10 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parses_dynamic_slippage_into_platform_config() {
|
fn parses_explicit_historical_slippage_into_platform_config() {
|
||||||
let spec = serde_json::json!({
|
let spec = serde_json::json!({
|
||||||
"execution": {
|
"execution": {
|
||||||
"slippageModel": "dynamic",
|
"slippageModel": "historical_volume_volatility",
|
||||||
"slippageImpactCoefficient": 0.6,
|
"slippageImpactCoefficient": 0.6,
|
||||||
"slippageVolatilityCoefficient": 0.2,
|
"slippageVolatilityCoefficient": 0.2,
|
||||||
"slippageMaxValue": 0.015
|
"slippageMaxValue": 0.015
|
||||||
@@ -4351,10 +4421,20 @@ mod tests {
|
|||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
cfg.slippage_model,
|
cfg.slippage_model,
|
||||||
SlippageModel::Dynamic(DynamicSlippageConfig::new(0.6, 0.2, 0.015))
|
SlippageModel::HistoricalVolumeVolatility(DynamicSlippageConfig::new(0.6, 0.2, 0.015))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn retired_or_unknown_slippage_models_do_not_fall_back_to_fixed_or_none() {
|
||||||
|
for model in ["dynamic", "dynamic_volume_volatility", "dynamic-volume-volatility", "unknown"] {
|
||||||
|
let spec = serde_json::json!({"execution": {"slippageModel": model, "slippageValue": 0.002}});
|
||||||
|
assert!(platform_expr_config_from_value("", "", &spec).is_err(), "{model}");
|
||||||
|
}
|
||||||
|
let spec = serde_json::json!({"execution": {"slippageModel": "historical_volume_volatility", "slippageImpactCoefficient": -1}});
|
||||||
|
assert!(platform_expr_config_from_value("", "", &spec).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn engine_stock_ma_filter_generates_price_and_volume_expr() {
|
fn engine_stock_ma_filter_generates_price_and_volume_expr() {
|
||||||
let spec = serde_json::json!({
|
let spec = serde_json::json!({
|
||||||
|
|||||||
@@ -676,6 +676,7 @@ pub struct PortfolioState {
|
|||||||
cash_receivables: Vec<CashReceivable>,
|
cash_receivables: Vec<CashReceivable>,
|
||||||
pending_cash_flows: Vec<PendingCashFlow>,
|
pending_cash_flows: Vec<PendingCashFlow>,
|
||||||
day_sold_symbols: BTreeSet<String>,
|
day_sold_symbols: BTreeSet<String>,
|
||||||
|
stock_pool_states: std::collections::BTreeMap<String,crate::stock_pool_state::StockPoolExecutionState>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@@ -712,6 +713,7 @@ impl PortfolioState {
|
|||||||
cash_receivables: Vec::new(),
|
cash_receivables: Vec::new(),
|
||||||
pending_cash_flows: Vec::new(),
|
pending_cash_flows: Vec::new(),
|
||||||
day_sold_symbols: BTreeSet::new(),
|
day_sold_symbols: BTreeSet::new(),
|
||||||
|
stock_pool_states: std::collections::BTreeMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -721,6 +723,15 @@ impl PortfolioState {
|
|||||||
self.initial_cash.to_f64()
|
self.initial_cash.to_f64()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stock_pool_execution_state(&self,pool_id:&str)->crate::stock_pool_state::StockPoolExecutionState{
|
||||||
|
self.stock_pool_states.get(pool_id).cloned().unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn set_stock_pool_execution_state(&mut self,pool_id:&str,state:crate::stock_pool_state::StockPoolExecutionState)->Result<(),String>{
|
||||||
|
if pool_id.trim().is_empty(){return Err("stock_pool_state_identity_missing".into())}
|
||||||
|
state.validate()?;self.stock_pool_states.insert(pool_id.into(),state);Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn initial_cash(&self) -> f64 {
|
pub fn initial_cash(&self) -> f64 {
|
||||||
self.initial_cash.to_f64()
|
self.initial_cash.to_f64()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -418,6 +418,7 @@ impl ChinaAShareRiskControl {
|
|||||||
RiskCheckScope::Sell => false,
|
RiskCheckScope::Sell => false,
|
||||||
};
|
};
|
||||||
if reject_one_yuan
|
if reject_one_yuan
|
||||||
|
&& !instrument.is_some_and(Instrument::is_exchange_traded_fund)
|
||||||
&& (candidate.is_one_yuan
|
&& (candidate.is_one_yuan
|
||||||
|| (market.day_open.is_finite() && market.day_open > 0.0 && market.day_open <= 1.0))
|
|| (market.day_open.is_finite() && market.day_open > 0.0 && market.day_open <= 1.0))
|
||||||
{
|
{
|
||||||
@@ -492,7 +493,8 @@ impl ChinaAShareRiskControl {
|
|||||||
}
|
}
|
||||||
// Daily candidate flags can describe the later close. Execution
|
// Daily candidate flags can describe the later close. Execution
|
||||||
// price constraints must use this order's actual pricing clock.
|
// price constraints must use this order's actual pricing clock.
|
||||||
if config.static_rules.reject_one_yuan_buy && check_price <= 1.0 {
|
if config.static_rules.reject_one_yuan_buy && check_price <= 1.0
|
||||||
|
&& !instrument.is_some_and(Instrument::is_exchange_traded_fund) {
|
||||||
return Some("one_yuan");
|
return Some("one_yuan");
|
||||||
}
|
}
|
||||||
if config.static_rules.respect_allow_buy_sell && !candidate.allow_buy {
|
if config.static_rules.respect_allow_buy_sell && !candidate.allow_buy {
|
||||||
@@ -936,6 +938,20 @@ mod tests {
|
|||||||
day, &candidate, &snapshot, None, 0.9, &relaxed), None);
|
day, &candidate, &snapshot, None, 0.9, &relaxed), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fund_identity_excludes_stock_one_yuan_rule_but_not_actual_price_and_pause_checks() {
|
||||||
|
let day=d(2025,2,6);
|
||||||
|
let mut candidate=candidate(day);
|
||||||
|
let mut snapshot=market(day,1.2,0.5);
|
||||||
|
snapshot.lower_limit=0.01;snapshot.upper_limit=10.;
|
||||||
|
let instrument=Instrument{symbol:candidate.symbol.clone(),name:"fixture fund".into(),board:"ETF".into(),round_lot:100,listed_at:Some(d(2024,1,2)),delisted_at:None,status:"active".into()};
|
||||||
|
let config=FidcRiskControlConfig::default();
|
||||||
|
assert_eq!(ChinaAShareRiskControl::buy_rejection_reason_with_config(day,&candidate,&snapshot,Some(&instrument),0.9,&config),None);
|
||||||
|
assert_eq!(ChinaAShareRiskControl::buy_rejection_reason_with_config(day,&candidate,&snapshot,Some(&instrument),0.,&config),Some("invalid execution price"));
|
||||||
|
candidate.is_paused=true;snapshot.paused=true;
|
||||||
|
assert_eq!(ChinaAShareRiskControl::buy_rejection_reason_with_config(day,&candidate,&snapshot,Some(&instrument),0.9,&config),Some("paused"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn execution_quote_covers_missing_one_yuan_flag_but_not_other_risk_facts() {
|
fn execution_quote_covers_missing_one_yuan_flag_but_not_other_risk_facts() {
|
||||||
let day = d(2025, 2, 6);
|
let day = d(2025, 2, 6);
|
||||||
|
|||||||
@@ -0,0 +1,229 @@
|
|||||||
|
//! Candidate provenance and ordering; contains no market-data or broker I/O.
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
pub const CANDIDATE_SOURCES_SCHEMA: u32 = 1;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
pub enum CandidateSourceMode {
|
||||||
|
Manual,
|
||||||
|
FilteredManual,
|
||||||
|
Automatic,
|
||||||
|
Mixed,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
pub enum CandidateSourcePriority {
|
||||||
|
#[default]
|
||||||
|
ManualFirst,
|
||||||
|
AutomaticFirst,
|
||||||
|
ListOrder,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CandidateSourcePolicy {
|
||||||
|
pub schema_version: u32,
|
||||||
|
pub mode: CandidateSourceMode,
|
||||||
|
#[serde(default)]
|
||||||
|
pub priority: CandidateSourcePriority,
|
||||||
|
#[serde(default)]
|
||||||
|
pub merged_order: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct CandidateMember {
|
||||||
|
pub symbol: String,
|
||||||
|
pub manual: bool,
|
||||||
|
pub automatic: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn symbols(values: &[String], label: &str) -> Result<Vec<String>, String> {
|
||||||
|
let mut seen = BTreeSet::new();
|
||||||
|
values.iter().map(|value| {
|
||||||
|
let symbol = value.trim().to_ascii_uppercase();
|
||||||
|
if !symbol.rsplit_once('.').is_some_and(|(code, exchange)| {
|
||||||
|
code.len() == 6 && code.bytes().all(|byte| byte.is_ascii_digit())
|
||||||
|
&& matches!(exchange, "SH" | "SZ" | "BJ")
|
||||||
|
}) {
|
||||||
|
return Err(format!("{label}: invalid qualified security code {value}"));
|
||||||
|
}
|
||||||
|
if !seen.insert(symbol.clone()) {
|
||||||
|
return Err(format!("{label}: duplicate security {symbol}"));
|
||||||
|
}
|
||||||
|
Ok(symbol)
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CandidateSourcePolicy {
|
||||||
|
pub fn validate(&self) -> Result<(), String> {
|
||||||
|
if self.schema_version != CANDIDATE_SOURCES_SCHEMA {
|
||||||
|
return Err("candidate_sources schema_version must be 1".into());
|
||||||
|
}
|
||||||
|
symbols(&self.merged_order, "candidate_sources.merged_order")?;
|
||||||
|
if self.mode != CandidateSourceMode::Mixed && self.priority != CandidateSourcePriority::ManualFirst {
|
||||||
|
return Err("candidate source priority only applies to mixed sources".into());
|
||||||
|
}
|
||||||
|
if self.priority != CandidateSourcePriority::ListOrder && !self.merged_order.is_empty() {
|
||||||
|
return Err("merged_order requires list_order priority".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn uses_screen(&self) -> bool {
|
||||||
|
self.mode != CandidateSourceMode::Manual
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn validate_screen_binding(&self, manual: &[String], has_screen: bool) -> Result<(), String> {
|
||||||
|
self.validate()?;
|
||||||
|
symbols(manual, "manual candidates")?;
|
||||||
|
if self.uses_screen() != has_screen {
|
||||||
|
return Err("candidate source mode and screen contract must agree".into());
|
||||||
|
}
|
||||||
|
if self.mode == CandidateSourceMode::FilteredManual && manual.is_empty() {
|
||||||
|
return Err("filtered_manual requires manual members; an empty scope must not become all-market".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Overlap between two valid sources denotes one member with both provenance
|
||||||
|
/// flags. Duplicates *within* a source are invalid evidence, not fixed by dedup.
|
||||||
|
pub fn resolve_candidates(
|
||||||
|
policy: &CandidateSourcePolicy,
|
||||||
|
manual: &[String],
|
||||||
|
automatic: Option<&[String]>,
|
||||||
|
) -> Result<Vec<CandidateMember>, String> {
|
||||||
|
policy.validate_screen_binding(manual, automatic.is_some())?;
|
||||||
|
let manual = symbols(manual, "manual candidates")?;
|
||||||
|
let automatic = automatic.map(|values| symbols(values, "automatic candidates")).transpose()?.unwrap_or_default();
|
||||||
|
let manual_set = manual.iter().cloned().collect::<BTreeSet<_>>();
|
||||||
|
let auto_set = automatic.iter().cloned().collect::<BTreeSet<_>>();
|
||||||
|
if policy.mode == CandidateSourceMode::FilteredManual && !auto_set.is_subset(&manual_set) {
|
||||||
|
return Err("filtered_manual snapshot contains a security outside the manual scope".into());
|
||||||
|
}
|
||||||
|
let mut ordered = match policy.mode {
|
||||||
|
CandidateSourceMode::Manual => manual.clone(),
|
||||||
|
CandidateSourceMode::FilteredManual | CandidateSourceMode::Automatic => automatic.clone(),
|
||||||
|
CandidateSourceMode::Mixed => {
|
||||||
|
let (first, second) = if policy.priority == CandidateSourcePriority::AutomaticFirst {
|
||||||
|
(&automatic, &manual)
|
||||||
|
} else { (&manual, &automatic) };
|
||||||
|
let mut union = first.clone();
|
||||||
|
let mut seen = first.iter().cloned().collect::<BTreeSet<_>>();
|
||||||
|
union.extend(second.iter().filter(|symbol| seen.insert((*symbol).clone())).cloned());
|
||||||
|
union
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if policy.priority == CandidateSourcePriority::ListOrder {
|
||||||
|
let present = ordered.iter().cloned().collect::<BTreeSet<_>>();
|
||||||
|
let prefix = symbols(&policy.merged_order, "candidate_sources.merged_order")?
|
||||||
|
.into_iter().filter(|symbol| present.contains(symbol)).collect::<Vec<_>>();
|
||||||
|
let selected = prefix.iter().cloned().collect::<BTreeSet<_>>();
|
||||||
|
let tail = ordered.into_iter().filter(|symbol| !selected.contains(symbol));
|
||||||
|
ordered = prefix.into_iter().chain(tail).collect();
|
||||||
|
}
|
||||||
|
Ok(ordered.into_iter().map(|symbol| CandidateMember {
|
||||||
|
manual: manual_set.contains(&symbol), automatic: auto_set.contains(&symbol), symbol,
|
||||||
|
}).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Raw daily automatic candidates remain unchanged. Every resolved list is
|
||||||
|
/// derived by the shared kernel; absent dates never inherit yesterday's list.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CandidateSourceBook {
|
||||||
|
pub schema_version: u32,
|
||||||
|
pub policy: CandidateSourcePolicy,
|
||||||
|
pub manual_symbols: Vec<String>,
|
||||||
|
pub automatic_symbols_by_date: BTreeMap<NaiveDate, Vec<String>>,
|
||||||
|
pub source_snapshot_sha256: String,
|
||||||
|
pub source_coverage_sha256: String,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub execution_symbols: Option<Vec<String>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CandidateSourceBook {
|
||||||
|
pub fn resolve(&self) -> Result<BTreeMap<NaiveDate, Vec<CandidateMember>>, String> {
|
||||||
|
if self.schema_version != CANDIDATE_SOURCES_SCHEMA || !self.policy.uses_screen() {
|
||||||
|
return Err("candidate source book requires schema 1 and a screened source".into());
|
||||||
|
}
|
||||||
|
for value in [&self.source_snapshot_sha256, &self.source_coverage_sha256] {
|
||||||
|
if value.len() != 64 || !value.bytes().all(|byte| byte.is_ascii_hexdigit()) {
|
||||||
|
return Err("candidate source book requires snapshot and coverage SHA256".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if self.automatic_symbols_by_date.is_empty() {
|
||||||
|
return Err("candidate source book requires explicit covered trading dates".into());
|
||||||
|
}
|
||||||
|
let scope = self.execution_symbols.as_ref().map(|values| symbols(values, "candidate execution scope")
|
||||||
|
.map(|values| values.into_iter().collect::<BTreeSet<_>>())).transpose()?;
|
||||||
|
self.automatic_symbols_by_date.iter().map(|(day, values)| {
|
||||||
|
resolve_candidates(&self.policy, &self.manual_symbols, Some(values))
|
||||||
|
.map(|members| (*day, members.into_iter().filter(|member| scope.as_ref().is_none_or(|scope| scope.contains(&member.symbol))).collect()))
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn resolved_symbols(&self) -> Result<BTreeMap<NaiveDate, Vec<String>>, String> {
|
||||||
|
Ok(self.resolve()?.into_iter().map(|(date, values)|
|
||||||
|
(date, values.into_iter().map(|member| member.symbol).collect())).collect())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn list(values: &[&str]) -> Vec<String> { values.iter().map(|value| value.to_string()).collect() }
|
||||||
|
fn policy(mode: CandidateSourceMode, priority: CandidateSourcePriority) -> CandidateSourcePolicy {
|
||||||
|
CandidateSourcePolicy { schema_version: 1, mode, priority, merged_order: vec![] }
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn mixed_sources_preserve_priority_and_both_provenances() {
|
||||||
|
let manual = list(&["600000.SH", "000001.SZ"]);
|
||||||
|
let automatic = list(&["000002.SZ", "000001.SZ"]);
|
||||||
|
for (priority, expected) in [
|
||||||
|
(CandidateSourcePriority::ManualFirst, list(&["600000.SH", "000001.SZ", "000002.SZ"])),
|
||||||
|
(CandidateSourcePriority::AutomaticFirst, list(&["000002.SZ", "000001.SZ", "600000.SH"])),
|
||||||
|
] {
|
||||||
|
let result = resolve_candidates(&policy(CandidateSourceMode::Mixed, priority), &manual, Some(&automatic)).unwrap();
|
||||||
|
assert_eq!(result.iter().map(|value| value.symbol.clone()).collect::<Vec<_>>(), expected);
|
||||||
|
let overlap = result.iter().find(|value| value.symbol == "000001.SZ").unwrap();
|
||||||
|
assert!(overlap.manual && overlap.automatic);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn list_order_reuses_explicit_prefix_and_appends_new_candidates() {
|
||||||
|
let mut p = policy(CandidateSourceMode::Mixed, CandidateSourcePriority::ListOrder);
|
||||||
|
p.merged_order = list(&["000002.SZ", "600036.SH", "600000.SH"]);
|
||||||
|
let result = resolve_candidates(&p, &list(&["600000.SH", "000001.SZ"]), Some(&list(&["000002.SZ", "000003.SZ"]))).unwrap();
|
||||||
|
assert_eq!(result.into_iter().map(|row| row.symbol).collect::<Vec<_>>(), list(&["000002.SZ", "600000.SH", "000001.SZ", "000003.SZ"]));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn missing_snapshot_duplicate_input_and_empty_filtered_scope_fail() {
|
||||||
|
let p = policy(CandidateSourceMode::Mixed, CandidateSourcePriority::ManualFirst);
|
||||||
|
assert!(resolve_candidates(&p, &[], None).is_err());
|
||||||
|
assert!(resolve_candidates(&p, &[], Some(&list(&["000001.SZ", "000001.sz"]))).is_err());
|
||||||
|
let p = policy(CandidateSourceMode::FilteredManual, CandidateSourcePriority::ManualFirst);
|
||||||
|
assert!(resolve_candidates(&p, &[], Some(&[])).unwrap_err().contains("all-market"));
|
||||||
|
assert!(resolve_candidates(&p, &list(&["000001.SZ"]), Some(&list(&["600000.SH"]))).is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn zero_automatic_day_keeps_manual_members_without_inheriting_old_auto_targets() {
|
||||||
|
let day1 = NaiveDate::from_ymd_opt(2026, 9, 9).unwrap();
|
||||||
|
let day2 = NaiveDate::from_ymd_opt(2026, 9, 10).unwrap();
|
||||||
|
let book = CandidateSourceBook { schema_version: 1,
|
||||||
|
policy: policy(CandidateSourceMode::Mixed, CandidateSourcePriority::AutomaticFirst),
|
||||||
|
manual_symbols: list(&["510300.SH"]),
|
||||||
|
automatic_symbols_by_date: BTreeMap::from([(day1, list(&["000001.SZ"])), (day2, vec![])]),
|
||||||
|
source_snapshot_sha256: "a".repeat(64), source_coverage_sha256: "b".repeat(64), execution_symbols:None };
|
||||||
|
let result = book.resolved_symbols().unwrap();
|
||||||
|
assert_eq!(result[&day1], list(&["000001.SZ", "510300.SH"]));
|
||||||
|
assert_eq!(result[&day2], list(&["510300.SH"]));
|
||||||
|
let mut auto = book; auto.policy = policy(CandidateSourceMode::Automatic, CandidateSourcePriority::ManualFirst);
|
||||||
|
assert!(auto.resolved_symbols().unwrap()[&day2].is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,150 @@
|
|||||||
|
//! Dated non-tradability and valuation are separate from execution quotations.
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
pub(super) fn validate(
|
||||||
|
signal_date: NaiveDate,
|
||||||
|
constraints: &StockPoolDecisionConstraints,
|
||||||
|
current: &BTreeMap<String, (Decimal, Decimal, Decimal)>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
for (symbol, fact) in &constraints.frozen_positions {
|
||||||
|
if constraints.execution_date != Some(fact.trade_date)
|
||||||
|
|| fact.trade_date < signal_date
|
||||||
|
|| fact.reason != "paused"
|
||||||
|
|| fact.valuation_price <= Decimal::ZERO
|
||||||
|
|| current.get(symbol).is_none_or(|row| row.0 <= Decimal::ZERO)
|
||||||
|
{
|
||||||
|
return Err(format!("stock_pool_frozen_position_invalid:{symbol}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if constraints
|
||||||
|
.prior_target_weights
|
||||||
|
.iter()
|
||||||
|
.any(|(symbol, weight)| {
|
||||||
|
normalize_stock_symbol(symbol).as_ref() != Some(symbol)
|
||||||
|
|| !(0..=10_000).contains(weight)
|
||||||
|
})
|
||||||
|
{
|
||||||
|
return Err("stock_pool_prior_target_weights_invalid".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn valuation(
|
||||||
|
symbol: &str,
|
||||||
|
quotes: &HashMap<String, &MarketSnapshot>,
|
||||||
|
frozen: &BTreeMap<String, FrozenStockPoolPosition>,
|
||||||
|
) -> Result<Decimal, String> {
|
||||||
|
frozen
|
||||||
|
.get(symbol)
|
||||||
|
.map(|fact| fact.valuation_price)
|
||||||
|
.or_else(|| quotes.get(symbol).map(|quote| quote.last_price))
|
||||||
|
.filter(|price| *price > Decimal::ZERO)
|
||||||
|
.ok_or_else(|| format!("{symbol} confirmed holding valuation missing"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn weights(
|
||||||
|
original: &[String],
|
||||||
|
active: &[String],
|
||||||
|
members: &[StockPoolMemberSpec],
|
||||||
|
explicit: &BTreeMap<String, i32>,
|
||||||
|
constraints: &StockPoolDecisionConstraints,
|
||||||
|
reserved_slots: usize,
|
||||||
|
target_count: usize,
|
||||||
|
) -> Result<BTreeMap<String, i32>, String> {
|
||||||
|
let count = original.len() + reserved_slots;
|
||||||
|
let order = members
|
||||||
|
.iter()
|
||||||
|
.map(|member| (&member.symbol, member.requested_order))
|
||||||
|
.collect::<BTreeMap<_, _>>();
|
||||||
|
let mut original_budget_symbols = original.to_vec();
|
||||||
|
for symbol in constraints.frozen_positions.keys() {
|
||||||
|
if order.contains_key(symbol) && !original_budget_symbols.contains(symbol) {
|
||||||
|
original_budget_symbols.push(symbol.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if original_budget_symbols.len() != original.len() {
|
||||||
|
original_budget_symbols
|
||||||
|
.sort_by_key(|symbol| order.get(symbol).copied().unwrap_or(i32::MAX));
|
||||||
|
}
|
||||||
|
let initial = original_budget_symbols
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(index, symbol)| {
|
||||||
|
let weight = if explicit.is_empty() {
|
||||||
|
if count == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
10_000 / count as i32 + i32::from(index < 10_000 % count)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
*explicit.get(symbol).unwrap_or(&0)
|
||||||
|
};
|
||||||
|
(symbol.clone(), weight)
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let mut frozen = BTreeMap::new();
|
||||||
|
for symbol in constraints.frozen_positions.keys() {
|
||||||
|
let weight = explicit
|
||||||
|
.get(symbol)
|
||||||
|
.copied()
|
||||||
|
.or_else(|| constraints.prior_target_weights.get(symbol).copied())
|
||||||
|
.or_else(|| {
|
||||||
|
initial
|
||||||
|
.iter()
|
||||||
|
.find(|(key, _)| key == symbol)
|
||||||
|
.map(|(_, weight)| *weight)
|
||||||
|
})
|
||||||
|
.ok_or_else(|| format!("stock_pool_frozen_position_target_weight_missing:{symbol}"))?;
|
||||||
|
frozen.insert(symbol.clone(), weight);
|
||||||
|
}
|
||||||
|
let frozen_total = frozen.values().copied().sum::<i32>();
|
||||||
|
if frozen_total > 10_000 {
|
||||||
|
return Err("stock_pool_frozen_position_weights_exceed_budget".into());
|
||||||
|
}
|
||||||
|
let mut free = initial
|
||||||
|
.into_iter()
|
||||||
|
.filter(|(symbol, _)| !frozen.contains_key(symbol))
|
||||||
|
.map(|(symbol, weight)| (symbol, weight as u32))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let total = free.iter().map(|(_, weight)| *weight).sum::<u32>();
|
||||||
|
let available = (10_000 - frozen_total) as u32;
|
||||||
|
// A paused holding removed from today's candidates still owns its prior
|
||||||
|
// budget. Scale only the new tradable allocation, never the frozen leg.
|
||||||
|
if total > available {
|
||||||
|
let mut remainder = available;
|
||||||
|
for (_, weight) in &mut free {
|
||||||
|
*weight = (u64::from(*weight) * u64::from(available) / u64::from(total)) as u32;
|
||||||
|
remainder -= *weight;
|
||||||
|
}
|
||||||
|
for (_, weight) in free.iter_mut().take(remainder as usize) {
|
||||||
|
*weight += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let excluded = free
|
||||||
|
.iter()
|
||||||
|
.filter(|(symbol, _)| !active.contains(symbol))
|
||||||
|
.map(|(symbol, _)| symbol.clone())
|
||||||
|
.collect();
|
||||||
|
let candidates = active
|
||||||
|
.iter()
|
||||||
|
.filter(|symbol| !frozen.contains_key(*symbol))
|
||||||
|
.cloned()
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let allocated = crate::platform_expr_strategy::replenish_target_weight_bps(
|
||||||
|
&free,
|
||||||
|
&candidates,
|
||||||
|
&excluded,
|
||||||
|
target_count.saturating_sub(
|
||||||
|
frozen
|
||||||
|
.keys()
|
||||||
|
.filter(|symbol| original.contains(symbol))
|
||||||
|
.count(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
frozen.extend(
|
||||||
|
allocated
|
||||||
|
.into_iter()
|
||||||
|
.map(|(symbol, weight)| (symbol, weight as i32)),
|
||||||
|
);
|
||||||
|
Ok(frozen)
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
//! Index exposure is independent of relative-weight maintenance. Reduce the
|
||||||
|
//! existing proportions only when the portfolio exceeds its index budget.
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
pub(super) struct IndexCapTarget {
|
||||||
|
pub quantity: Decimal,
|
||||||
|
pub blocked_by_t1: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn remaining_index_targets(
|
||||||
|
current: &BTreeMap<String, (Decimal, Decimal, Decimal)>,
|
||||||
|
members: &HashMap<String, &StockPoolMemberSpec>,
|
||||||
|
automatic: &BTreeMap<String, crate::holding_policy::AutomaticTradePermission>,
|
||||||
|
already_planned: &[StockPoolPlanRow],
|
||||||
|
quotes: &HashMap<String, &MarketSnapshot>,
|
||||||
|
frozen: &BTreeMap<String, FrozenStockPoolPosition>,
|
||||||
|
budget: Decimal,
|
||||||
|
) -> Result<BTreeMap<String, IndexCapTarget>, String> {
|
||||||
|
struct Entry {
|
||||||
|
symbol: String,
|
||||||
|
quantity: Decimal,
|
||||||
|
minimum: Decimal,
|
||||||
|
price: Decimal,
|
||||||
|
}
|
||||||
|
let other = already_planned
|
||||||
|
.iter()
|
||||||
|
.map(|row| (&row.symbol, row))
|
||||||
|
.collect::<BTreeMap<_, _>>();
|
||||||
|
let mut fixed = Decimal::ZERO;
|
||||||
|
let mut entries = Vec::new();
|
||||||
|
for (symbol, (quantity, closable, _)) in current.iter().filter(|(_, row)| row.0 > Decimal::ZERO)
|
||||||
|
{
|
||||||
|
let price = super::frozen::valuation(symbol, quotes, frozen)?;
|
||||||
|
let minimum = (*quantity - *closable).max(Decimal::ZERO);
|
||||||
|
let remaining = other
|
||||||
|
.get(symbol)
|
||||||
|
.map(|row| row.target_quantity.min(*quantity))
|
||||||
|
.unwrap_or(*quantity)
|
||||||
|
.max(minimum);
|
||||||
|
if frozen.contains_key(symbol)
|
||||||
|
|| automatic
|
||||||
|
.get(symbol)
|
||||||
|
.is_some_and(|permission| permission.sell_denial.is_some())
|
||||||
|
{
|
||||||
|
fixed += *quantity * price;
|
||||||
|
} else if members.contains_key(symbol) && remaining > Decimal::ZERO {
|
||||||
|
entries.push(Entry {
|
||||||
|
symbol: symbol.clone(),
|
||||||
|
quantity: remaining,
|
||||||
|
minimum,
|
||||||
|
price,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
fixed += remaining * price;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut remaining = entries
|
||||||
|
.iter()
|
||||||
|
.map(|row| row.quantity * row.price)
|
||||||
|
.sum::<Decimal>();
|
||||||
|
let mut available = (budget - fixed).max(Decimal::ZERO);
|
||||||
|
if remaining <= available {
|
||||||
|
return Ok(BTreeMap::new());
|
||||||
|
}
|
||||||
|
// The highest non-sellable proportions are fixed first; the remainder
|
||||||
|
// keeps its existing relative weights. No planned sale funds a new buy.
|
||||||
|
entries.sort_by(|left, right| {
|
||||||
|
(right.minimum / right.quantity)
|
||||||
|
.cmp(&(left.minimum / left.quantity))
|
||||||
|
.then_with(|| left.symbol.cmp(&right.symbol))
|
||||||
|
});
|
||||||
|
let mut result = BTreeMap::new();
|
||||||
|
for row in entries {
|
||||||
|
let scale = if remaining > Decimal::ZERO {
|
||||||
|
(available / remaining).min(Decimal::ONE)
|
||||||
|
} else {
|
||||||
|
Decimal::ZERO
|
||||||
|
};
|
||||||
|
let desired = (row.quantity * scale).floor();
|
||||||
|
let blocked = desired < row.minimum;
|
||||||
|
let target = desired.max(row.minimum).min(row.quantity);
|
||||||
|
remaining -= row.quantity * row.price;
|
||||||
|
available = (available - target * row.price).max(Decimal::ZERO);
|
||||||
|
result.insert(
|
||||||
|
row.symbol,
|
||||||
|
IndexCapTarget {
|
||||||
|
quantity: target,
|
||||||
|
blocked_by_t1: blocked,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
@@ -0,0 +1,344 @@
|
|||||||
|
//! Explicit index timing, shared by historical and online stock-pool planners.
|
||||||
|
//! Inputs are completed official sessions, not a shortened available-row window.
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(default, deny_unknown_fields)]
|
||||||
|
pub struct MarketTimingPolicy {
|
||||||
|
pub enabled: bool,
|
||||||
|
pub index_code: Option<String>,
|
||||||
|
pub fast_window: Option<usize>,
|
||||||
|
pub slow_window: Option<usize>,
|
||||||
|
pub volatility_window: Option<usize>,
|
||||||
|
pub drawdown_window: Option<usize>,
|
||||||
|
pub bull_exposure: Option<f64>,
|
||||||
|
pub bear_exposure: Option<f64>,
|
||||||
|
pub volatility_threshold: Option<f64>,
|
||||||
|
pub volatility_cap: Option<f64>,
|
||||||
|
pub drawdown_threshold: Option<f64>,
|
||||||
|
pub drawdown_cap: Option<f64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MarketTimingPolicy {
|
||||||
|
pub fn from_allocation(value: &serde_json::Value) -> Result<Self, String> {
|
||||||
|
let raw = value.get("market_timing").filter(|value| !value.is_null());
|
||||||
|
let policy = raw
|
||||||
|
.map(|raw| serde_json::from_value::<Self>(raw.clone()))
|
||||||
|
.transpose()
|
||||||
|
.map_err(|error| format!("market_timing_invalid:{error}"))?
|
||||||
|
.unwrap_or_default();
|
||||||
|
policy.validate()?;
|
||||||
|
Ok(policy)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn validate(&self) -> Result<(), String> {
|
||||||
|
if let Some(index) = &self.index_code {
|
||||||
|
let valid = index.split_once('.').is_some_and(|(code, exchange)| {
|
||||||
|
(6..=12).contains(&code.len())
|
||||||
|
&& code
|
||||||
|
.bytes()
|
||||||
|
.all(|v| v.is_ascii_uppercase() || v.is_ascii_digit())
|
||||||
|
&& matches!(exchange, "SH" | "SZ" | "CSI" | "CNI")
|
||||||
|
});
|
||||||
|
if !valid {
|
||||||
|
return Err("market_timing_index_code_invalid".into());
|
||||||
|
}
|
||||||
|
} else if self.enabled {
|
||||||
|
return Err("market_timing_index_code_required".into());
|
||||||
|
}
|
||||||
|
for (key, value) in [
|
||||||
|
("fast_window", self.fast_window),
|
||||||
|
("slow_window", self.slow_window),
|
||||||
|
("volatility_window", self.volatility_window),
|
||||||
|
("drawdown_window", self.drawdown_window),
|
||||||
|
] {
|
||||||
|
match value {
|
||||||
|
Some(value) if !(2..=250).contains(&value) => {
|
||||||
|
return Err(format!("market_timing_{key}_must_be_2_to_250"));
|
||||||
|
}
|
||||||
|
None if self.enabled => return Err(format!("market_timing_{key}_required")),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let (Some(fast), Some(slow)) = (self.fast_window, self.slow_window) {
|
||||||
|
if fast >= slow {
|
||||||
|
return Err("market_timing_fast_window_must_be_less_than_slow_window".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (key, value) in [
|
||||||
|
("bull_exposure", self.bull_exposure),
|
||||||
|
("bear_exposure", self.bear_exposure),
|
||||||
|
("volatility_threshold", self.volatility_threshold),
|
||||||
|
("volatility_cap", self.volatility_cap),
|
||||||
|
("drawdown_threshold", self.drawdown_threshold),
|
||||||
|
("drawdown_cap", self.drawdown_cap),
|
||||||
|
] {
|
||||||
|
match value {
|
||||||
|
Some(value) if !value.is_finite() || !(0.0..=1.0).contains(&value) => {
|
||||||
|
return Err(format!("market_timing_{key}_must_be_in_0_to_1"));
|
||||||
|
}
|
||||||
|
None if self.enabled => return Err(format!("market_timing_{key}_required")),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn required_history(&self) -> Result<usize, String> {
|
||||||
|
self.validate()?;
|
||||||
|
if !self.enabled {
|
||||||
|
return Ok(0);
|
||||||
|
}
|
||||||
|
Ok(self
|
||||||
|
.slow_window
|
||||||
|
.unwrap()
|
||||||
|
.max(self.volatility_window.unwrap() + 1)
|
||||||
|
.max(self.drawdown_window.unwrap()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct IndexClose {
|
||||||
|
pub date: NaiveDate,
|
||||||
|
pub close: f64,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct MarketTimingInput {
|
||||||
|
pub index_code: String,
|
||||||
|
pub as_of_date: NaiveDate,
|
||||||
|
pub official_dates: Vec<NaiveDate>,
|
||||||
|
pub closes: Vec<IndexClose>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct MarketTimingEvaluation {
|
||||||
|
pub index_code: String,
|
||||||
|
pub as_of_date: NaiveDate,
|
||||||
|
pub window_start: NaiveDate,
|
||||||
|
pub session_count: usize,
|
||||||
|
pub fast_ma: f64,
|
||||||
|
pub slow_ma: f64,
|
||||||
|
pub volatility: f64,
|
||||||
|
pub drawdown: f64,
|
||||||
|
pub exposure: f64,
|
||||||
|
pub reason_codes: Vec<String>,
|
||||||
|
pub policy_sha256: String,
|
||||||
|
pub input_sha256: String,
|
||||||
|
pub kernel_sha256: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn implementation_sha256() -> String {
|
||||||
|
format!(
|
||||||
|
"{:x}",
|
||||||
|
Sha256::digest(include_bytes!("stock_pool_index_policy.rs"))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn evaluate(
|
||||||
|
policy: &MarketTimingPolicy,
|
||||||
|
input: &MarketTimingInput,
|
||||||
|
decision_date: NaiveDate,
|
||||||
|
) -> Result<MarketTimingEvaluation, String> {
|
||||||
|
let needed = policy.required_history()?;
|
||||||
|
if needed == 0 {
|
||||||
|
return Err("market_timing_disabled_has_no_evaluation".into());
|
||||||
|
}
|
||||||
|
if policy.index_code.as_deref() != Some(input.index_code.as_str()) {
|
||||||
|
return Err("market_timing_input_index_mismatch".into());
|
||||||
|
}
|
||||||
|
if input.as_of_date > decision_date {
|
||||||
|
return Err("market_timing_future_input".into());
|
||||||
|
}
|
||||||
|
if input.official_dates.len() != needed
|
||||||
|
|| input.closes.len() != needed
|
||||||
|
|| input.official_dates.last() != Some(&input.as_of_date)
|
||||||
|
|| input
|
||||||
|
.official_dates
|
||||||
|
.windows(2)
|
||||||
|
.any(|pair| pair[0] >= pair[1])
|
||||||
|
{
|
||||||
|
return Err("market_timing_official_calendar_incomplete".into());
|
||||||
|
}
|
||||||
|
if input
|
||||||
|
.closes
|
||||||
|
.iter()
|
||||||
|
.zip(&input.official_dates)
|
||||||
|
.any(|(row, date)| row.date != *date || !row.close.is_finite() || row.close <= 0.)
|
||||||
|
{
|
||||||
|
return Err("market_timing_completed_index_rows_incomplete".into());
|
||||||
|
}
|
||||||
|
let closes = input.closes.iter().map(|row| row.close).collect::<Vec<_>>();
|
||||||
|
let mean = |window: usize| closes[needed - window..].iter().sum::<f64>() / window as f64;
|
||||||
|
let fast_ma = mean(policy.fast_window.unwrap());
|
||||||
|
let slow_ma = mean(policy.slow_window.unwrap());
|
||||||
|
let returns = closes[needed - policy.volatility_window.unwrap() - 1..]
|
||||||
|
.windows(2)
|
||||||
|
.map(|pair| pair[1] / pair[0] - 1.)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let average = returns.iter().sum::<f64>() / returns.len() as f64;
|
||||||
|
let volatility = (returns
|
||||||
|
.iter()
|
||||||
|
.map(|value| (value - average).powi(2))
|
||||||
|
.sum::<f64>()
|
||||||
|
/ (returns.len() - 1) as f64)
|
||||||
|
.sqrt();
|
||||||
|
let peak = closes[needed - policy.drawdown_window.unwrap()..]
|
||||||
|
.iter()
|
||||||
|
.copied()
|
||||||
|
.fold(f64::NEG_INFINITY, f64::max);
|
||||||
|
let drawdown = 1. - closes[needed - 1] / peak;
|
||||||
|
let bullish = fast_ma > slow_ma;
|
||||||
|
let mut exposure = if bullish {
|
||||||
|
policy.bull_exposure.unwrap()
|
||||||
|
} else {
|
||||||
|
policy.bear_exposure.unwrap()
|
||||||
|
};
|
||||||
|
let mut reason_codes = vec![
|
||||||
|
if bullish {
|
||||||
|
"fast_above_slow"
|
||||||
|
} else {
|
||||||
|
"fast_not_above_slow"
|
||||||
|
}
|
||||||
|
.into(),
|
||||||
|
];
|
||||||
|
if volatility >= policy.volatility_threshold.unwrap() {
|
||||||
|
exposure = exposure.min(policy.volatility_cap.unwrap());
|
||||||
|
reason_codes.push("volatility_cap".into());
|
||||||
|
}
|
||||||
|
if drawdown >= policy.drawdown_threshold.unwrap() {
|
||||||
|
exposure = exposure.min(policy.drawdown_cap.unwrap());
|
||||||
|
reason_codes.push("drawdown_cap".into());
|
||||||
|
}
|
||||||
|
if [fast_ma, slow_ma, volatility, drawdown, exposure]
|
||||||
|
.iter()
|
||||||
|
.any(|value| !value.is_finite())
|
||||||
|
{
|
||||||
|
return Err("market_timing_nonfinite_result".into());
|
||||||
|
}
|
||||||
|
let hash = |value: &serde_json::Value| -> Result<String, String> {
|
||||||
|
Ok(format!(
|
||||||
|
"{:x}",
|
||||||
|
Sha256::digest(serde_json::to_vec(value).map_err(|error| error.to_string())?)
|
||||||
|
))
|
||||||
|
};
|
||||||
|
Ok(MarketTimingEvaluation {
|
||||||
|
index_code: input.index_code.clone(),
|
||||||
|
as_of_date: input.as_of_date,
|
||||||
|
window_start: input.official_dates[0],
|
||||||
|
session_count: needed,
|
||||||
|
fast_ma,
|
||||||
|
slow_ma,
|
||||||
|
volatility,
|
||||||
|
drawdown,
|
||||||
|
exposure,
|
||||||
|
reason_codes,
|
||||||
|
policy_sha256: hash(&serde_json::to_value(policy).map_err(|error| error.to_string())?)?,
|
||||||
|
input_sha256: hash(&serde_json::to_value(input).map_err(|error| error.to_string())?)?,
|
||||||
|
kernel_sha256: implementation_sha256(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn policy() -> MarketTimingPolicy {
|
||||||
|
serde_json::from_value(serde_json::json!({"enabled":true,"index_code":"000300.SH","fast_window":10,"slow_window":30,
|
||||||
|
"volatility_window":20,"drawdown_window":60,"bull_exposure":1.0,"bear_exposure":0.3,"volatility_threshold":0.025,
|
||||||
|
"volatility_cap":0.3,"drawdown_threshold":0.08,"drawdown_cap":0.2})).unwrap()
|
||||||
|
}
|
||||||
|
fn input(values: Vec<f64>) -> MarketTimingInput {
|
||||||
|
let dates = (0..values.len())
|
||||||
|
.map(|i| {
|
||||||
|
NaiveDate::from_ymd_opt(2026, 1, 1).unwrap() + chrono::Duration::days(i as i64)
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
MarketTimingInput {
|
||||||
|
index_code: "000300.SH".into(),
|
||||||
|
as_of_date: *dates.last().unwrap(),
|
||||||
|
closes: dates
|
||||||
|
.iter()
|
||||||
|
.zip(values)
|
||||||
|
.map(|(date, close)| IndexClose { date: *date, close })
|
||||||
|
.collect(),
|
||||||
|
official_dates: dates,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn trend_and_caps_match_the_declared_math_and_keep_zero_meaningful() {
|
||||||
|
for (prices, expected) in [
|
||||||
|
((0..60).map(|i| 100. + i as f64).collect(), 1.),
|
||||||
|
((0..60).map(|i| 200. - i as f64).collect(), 0.2),
|
||||||
|
(
|
||||||
|
(0..59)
|
||||||
|
.map(|i| 100. + i as f64 * 0.1)
|
||||||
|
.chain([150.])
|
||||||
|
.collect(),
|
||||||
|
0.3,
|
||||||
|
),
|
||||||
|
] {
|
||||||
|
let input = input(prices);
|
||||||
|
let result = evaluate(&policy(), &input, input.as_of_date).unwrap();
|
||||||
|
assert_eq!(result.exposure, expected);
|
||||||
|
assert_eq!(result.session_count, 60);
|
||||||
|
assert_eq!(result.input_sha256.len(), 64);
|
||||||
|
}
|
||||||
|
let input = input(vec![100.; 60]);
|
||||||
|
let mut zero = policy();
|
||||||
|
zero.bear_exposure = Some(0.);
|
||||||
|
assert_eq!(
|
||||||
|
evaluate(&zero, &input, input.as_of_date).unwrap().exposure,
|
||||||
|
0.
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn missing_or_duplicate_or_future_rows_never_shorten_the_window() {
|
||||||
|
let base = input(vec![100.; 60]);
|
||||||
|
let mut invalid = base.clone();
|
||||||
|
invalid.closes.remove(5);
|
||||||
|
assert!(evaluate(&policy(), &invalid, base.as_of_date).is_err());
|
||||||
|
let mut invalid = base.clone();
|
||||||
|
invalid.closes[5].date = invalid.closes[4].date;
|
||||||
|
assert!(evaluate(&policy(), &invalid, base.as_of_date).is_err());
|
||||||
|
let mut invalid = base.clone();
|
||||||
|
invalid.closes[5].close = f64::NAN;
|
||||||
|
assert!(evaluate(&policy(), &invalid, base.as_of_date).is_err());
|
||||||
|
assert!(
|
||||||
|
evaluate(
|
||||||
|
&policy(),
|
||||||
|
&base,
|
||||||
|
base.as_of_date - chrono::Duration::days(1)
|
||||||
|
)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
let mut invalid = base.clone();
|
||||||
|
invalid.index_code = "000852.SH".into();
|
||||||
|
assert!(evaluate(&policy(), &invalid, base.as_of_date).is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn disabled_is_optional_but_enabled_parameters_are_not_invented() {
|
||||||
|
assert_eq!(
|
||||||
|
MarketTimingPolicy::from_allocation(&serde_json::Value::Null)
|
||||||
|
.unwrap()
|
||||||
|
.required_history()
|
||||||
|
.unwrap(),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
MarketTimingPolicy::from_allocation(
|
||||||
|
&serde_json::json!({"market_timing":{"enabled":true}})
|
||||||
|
)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
let mut invalid = policy();
|
||||||
|
invalid.fast_window = invalid.slow_window;
|
||||||
|
assert!(invalid.validate().is_err());
|
||||||
|
let mut invalid = policy();
|
||||||
|
invalid.volatility_window = Some(250);
|
||||||
|
assert_eq!(invalid.required_history().unwrap(), 251);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,179 @@
|
|||||||
|
//! Shared causal indicator calculation for stock-pool screening.
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::json;
|
||||||
|
|
||||||
|
use crate::factor_events::{self, Expr, Frame};
|
||||||
|
|
||||||
|
pub fn implementation_sha256() -> String {
|
||||||
|
use sha2::{Digest,Sha256};
|
||||||
|
let mut identity=Sha256::new();
|
||||||
|
identity.update(include_bytes!("stock_pool_indicators.rs"));
|
||||||
|
identity.update(factor_events::catalog()["expression_kernel_sha256"].as_str().expect("native kernel identity"));
|
||||||
|
format!("{:x}",identity.finalize())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct IndicatorSpec {
|
||||||
|
pub indicator: String,
|
||||||
|
pub field: String,
|
||||||
|
pub window: usize,
|
||||||
|
#[serde(default)]
|
||||||
|
pub output: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct InputSeries {
|
||||||
|
pub frame: Frame,
|
||||||
|
/// Source-admitted historical suspension/lifecycle gaps, not guessed from
|
||||||
|
/// missing prices. The pure endpoint never certifies those source facts.
|
||||||
|
#[serde(default)]
|
||||||
|
pub admitted_missing_dates: BTreeSet<NaiveDate>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Request {
|
||||||
|
pub specs: BTreeMap<String, IndicatorSpec>,
|
||||||
|
pub series: Vec<InputSeries>,
|
||||||
|
pub output_start_date: NaiveDate,
|
||||||
|
pub output_end_date: NaiveDate,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
pub struct OutputSeries {
|
||||||
|
pub symbol: String,
|
||||||
|
pub indices: Vec<usize>,
|
||||||
|
pub values: BTreeMap<String, Vec<Option<f64>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn evaluate(request: Request) -> Result<Vec<OutputSeries>, String> {
|
||||||
|
let row_count: usize = request.series.iter().map(|series| series.frame.timestamps.len()).sum();
|
||||||
|
if request.specs.is_empty() || request.specs.len() > 64 || row_count > 60_000
|
||||||
|
|| row_count.saturating_mul(request.specs.len()) > 1_000_000
|
||||||
|
|| request.output_start_date > request.output_end_date {
|
||||||
|
return Err("stock_pool_indicator_request_budget_or_range_invalid".into());
|
||||||
|
}
|
||||||
|
for spec in request.specs.values() {
|
||||||
|
if !matches!(spec.indicator.as_str(), "ma" | "ema" | "kdj") || !(2..=10_000).contains(&spec.window)
|
||||||
|
|| !matches!(spec.field.as_str(), "close" | "volume" | "high" | "low")
|
||||||
|
|| (spec.indicator == "kdj" && !matches!(spec.output.as_deref(), Some("k" | "d" | "j"))) {
|
||||||
|
return Err("stock_pool_indicator_spec_invalid".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut seen = BTreeSet::new();
|
||||||
|
let mut result = Vec::new();
|
||||||
|
for series in request.series {
|
||||||
|
let frame = series.frame;
|
||||||
|
frame.validate()?;
|
||||||
|
if frame.frequency != "1d" { return Err("stock_pool_indicators_require_daily_source".into()); }
|
||||||
|
if series.admitted_missing_dates.iter().any(|day| !frame.timestamps.iter().any(|stamp| stamp.date_naive() == *day)) {
|
||||||
|
return Err("admitted_missing_date_is_outside_the_input_frame".into());
|
||||||
|
}
|
||||||
|
if !seen.insert(frame.symbol.clone()) { return Err("stock_pool_indicator_duplicate_symbol".into()); }
|
||||||
|
let indices = frame.timestamps.iter().enumerate().filter(|(_, stamp)| {
|
||||||
|
let day = stamp.date_naive(); request.output_start_date <= day && day <= request.output_end_date
|
||||||
|
}).map(|(index, _)| index).collect::<Vec<_>>();
|
||||||
|
let mut values = BTreeMap::new();
|
||||||
|
for (key, spec) in &request.specs {
|
||||||
|
let fields: Vec<&str> = if spec.indicator == "kdj" { vec!["high", "low", "close"] } else { vec![&spec.field] };
|
||||||
|
for field in &fields {
|
||||||
|
let raw = frame.fields.get(*field).ok_or_else(|| format!("indicator_field_missing:{field}"))?;
|
||||||
|
if raw.len() != frame.timestamps.len() { return Err("indicator_field_length_mismatch".into()); }
|
||||||
|
}
|
||||||
|
for index in 0..frame.timestamps.len() {
|
||||||
|
let valid = fields.iter().all(|field| frame.fields[*field][index].is_some_and(f64::is_finite));
|
||||||
|
if valid {
|
||||||
|
if fields.iter().any(|field| frame.fields[*field][index].is_some_and(|value| if *field == "volume" { value < 0.0 } else { value <= 0.0 })) {
|
||||||
|
return Err(format!("indicator_input_value_invalid:{}:{}", frame.symbol, frame.timestamps[index]));
|
||||||
|
}
|
||||||
|
if spec.indicator == "kdj" {
|
||||||
|
let (hi, lo, close) = (frame.fields["high"][index].unwrap(), frame.fields["low"][index].unwrap(), frame.fields["close"][index].unwrap());
|
||||||
|
if hi < lo || close < lo || close > hi { return Err(format!("indicator_ohlc_invalid:{}:{}", frame.symbol, frame.timestamps[index])); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if !series.admitted_missing_dates.contains(&frame.timestamps[index].date_naive()) {
|
||||||
|
return Err(format!("unclassified_indicator_input_gap:{}:{}", frame.symbol, frame.timestamps[index]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let native_values = {
|
||||||
|
// The native KDJ has its own initialisation and lookback. Do
|
||||||
|
// not recreate it as STOCH or an independently seeded loop.
|
||||||
|
// Preserve admitted NULL rows too: the shared kernel defines
|
||||||
|
// gap/warmup semantics; compressing the calendar changes them.
|
||||||
|
let expression: Expr = serde_json::from_value(if spec.indicator == "kdj" {
|
||||||
|
json!({"kind":"indicator","name":"KDJ","inputs":[],
|
||||||
|
"parameters":{"optInFastK_Period":spec.window,"optInSlowK_Period":3,
|
||||||
|
"optInSlowK_MAType":13,"optInSlowD_Period":3,"optInSlowD_MAType":13},
|
||||||
|
"output":match spec.output.as_deref() { Some("k") => 0, Some("d") => 1, _ => 2 }})
|
||||||
|
} else {
|
||||||
|
json!({"kind":"indicator","name":if spec.indicator == "ma" {"SMA"} else {"EMA"},
|
||||||
|
"inputs":[{"kind":"field","name":spec.field}],"parameters":{"optInTimePeriod":spec.window}})
|
||||||
|
}).map_err(|error| error.to_string())?;
|
||||||
|
factor_events::evaluate(&expression, &frame)?.values
|
||||||
|
};
|
||||||
|
values.insert(key.clone(), indices.iter().map(|index| native_values[*index]).collect());
|
||||||
|
}
|
||||||
|
result.push(OutputSeries { symbol: frame.symbol, indices, values });
|
||||||
|
}
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn request() -> Request {
|
||||||
|
serde_json::from_value(json!({"specs":{"ma":{"indicator":"ma","field":"close","window":3},"ema":{"indicator":"ema","field":"close","window":3},"j":{"indicator":"kdj","field":"close","window":3,"output":"j"}},
|
||||||
|
"series":[{"frame":{"symbol":"000001.SZ","frequency":"1d","decision_at":"2026-09-10T17:00:00+08:00",
|
||||||
|
"timestamps":["2026-09-07T15:00:00+08:00","2026-09-08T15:00:00+08:00","2026-09-09T15:00:00+08:00","2026-09-10T15:00:00+08:00"],
|
||||||
|
"available_at":["2026-09-07T16:00:00+08:00","2026-09-08T16:00:00+08:00","2026-09-09T16:00:00+08:00","2026-09-10T16:00:00+08:00"],
|
||||||
|
"fields":{"close":[1.,2.,3.,4.],"high":[2.,3.,4.,5.],"low":[0.5,1.,2.,3.]}}}],
|
||||||
|
"output_start_date":"2026-09-09","output_end_date":"2026-09-10"})).unwrap()
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn uses_shared_ma_ema_and_preserves_recursive_prefix_before_output_window() {
|
||||||
|
let rows = evaluate(request()).unwrap();
|
||||||
|
assert_eq!(rows[0].indices,vec![2,3]);
|
||||||
|
assert_eq!(rows[0].values["ma"],vec![Some(2.),Some(3.)]);
|
||||||
|
assert_eq!(rows[0].values["ema"],vec![Some(2.),Some(3.)]);
|
||||||
|
assert_eq!(rows[0].values["j"], vec![None, None]); // KDJ has a longer native lookback.
|
||||||
|
let mut later = request(); later.output_start_date = NaiveDate::from_ymd_opt(2026,9,10).unwrap();
|
||||||
|
assert_eq!(evaluate(later).unwrap()[0].values["ema"],vec![rows[0].values["ema"][1]]);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn kdj_uses_the_same_frozen_native_kernel_as_event_conditions() {
|
||||||
|
let mut data = request();
|
||||||
|
let frame = &mut data.series[0].frame;
|
||||||
|
for i in 4..16 {
|
||||||
|
let day = NaiveDate::from_ymd_opt(2026,9,7).unwrap() + chrono::Duration::days(i);
|
||||||
|
frame.timestamps.push(chrono::DateTime::parse_from_rfc3339(&format!("{day}T15:00:00+08:00")).unwrap());
|
||||||
|
frame.available_at.push(chrono::DateTime::parse_from_rfc3339(&format!("{day}T16:00:00+08:00")).unwrap());
|
||||||
|
frame.fields.get_mut("close").unwrap().push(Some(i as f64 + 1.));
|
||||||
|
frame.fields.get_mut("high").unwrap().push(Some(i as f64 + 2.));
|
||||||
|
frame.fields.get_mut("low").unwrap().push(Some(i as f64));
|
||||||
|
}
|
||||||
|
frame.decision_at = chrono::DateTime::parse_from_rfc3339("2026-09-23T17:00:00+08:00").unwrap();
|
||||||
|
data.output_start_date=NaiveDate::from_ymd_opt(2026,9,7).unwrap();
|
||||||
|
data.output_end_date=NaiveDate::from_ymd_opt(2026,9,22).unwrap();
|
||||||
|
let native:Expr=serde_json::from_value(json!({"kind":"indicator","name":"KDJ","inputs":[],"parameters":{"optInFastK_Period":3},"output":2})).unwrap();
|
||||||
|
let expected=factor_events::evaluate(&native,frame).unwrap().values;
|
||||||
|
assert!(expected.iter().any(Option::is_some));
|
||||||
|
assert_eq!(evaluate(data).unwrap()[0].values["j"],expected);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn missing_inputs_require_source_admission_and_future_inputs_fail() {
|
||||||
|
let mut data = request(); data.series[0].frame.fields.get_mut("close").unwrap()[1] = None;
|
||||||
|
assert!(evaluate(data).unwrap_err().contains("unclassified_indicator_input_gap"));
|
||||||
|
let mut data = request(); data.series[0].frame.available_at[3] = chrono::DateTime::parse_from_rfc3339("2026-09-11T16:00:00+08:00").unwrap();
|
||||||
|
assert!(evaluate(data).is_err());
|
||||||
|
let mut data=request();data.series[0].frame.fields.get_mut("close").unwrap()[1]=None;
|
||||||
|
data.series[0].admitted_missing_dates.insert(NaiveDate::from_ymd_opt(2026,9,8).unwrap());
|
||||||
|
let native:Expr=serde_json::from_value(json!({"kind":"indicator","name":"EMA","inputs":[{"kind":"field","name":"close"}],"parameters":{"optInTimePeriod":3}})).unwrap();
|
||||||
|
let expected=factor_events::evaluate(&native,&data.series[0].frame).unwrap().values;
|
||||||
|
assert_eq!(expected[2..], [None,None]);
|
||||||
|
assert_eq!(evaluate(data).unwrap()[0].values["ema"],expected[2..]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
//! Configurable index-to-market-cap band. Values are CNY, not implicit yi.
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct IndexMarketCapPolicy {
|
||||||
|
pub schema_version: u32,
|
||||||
|
pub index_code: String,
|
||||||
|
pub field: String,
|
||||||
|
pub value_unit: String,
|
||||||
|
pub index_low: f64,
|
||||||
|
pub index_high: f64,
|
||||||
|
pub lower_at_low: f64,
|
||||||
|
pub lower_at_high: f64,
|
||||||
|
pub upper_at_low: f64,
|
||||||
|
pub upper_at_high: f64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IndexMarketCapPolicy {
|
||||||
|
pub fn validate(&self) -> Result<(), String> {
|
||||||
|
if self.schema_version != 1 || self.value_unit != "CNY"
|
||||||
|
|| !matches!(self.field.as_str(), "market_cap" | "float_market_cap")
|
||||||
|
{ return Err("index_market_cap_contract_invalid".into()); }
|
||||||
|
let index = self.index_code.split_once('.').is_some_and(|(code, exchange)| {
|
||||||
|
(6..=12).contains(&code.len())
|
||||||
|
&& code.bytes().all(|byte| byte.is_ascii_uppercase() || byte.is_ascii_digit())
|
||||||
|
&& matches!(exchange, "SH" | "SZ" | "CSI" | "CNI")
|
||||||
|
});
|
||||||
|
if !index { return Err("index_market_cap_index_invalid".into()); }
|
||||||
|
if [self.index_low,self.index_high,self.lower_at_low,self.lower_at_high,self.upper_at_low,self.upper_at_high]
|
||||||
|
.iter().any(|value| !value.is_finite() || *value <= 0.)
|
||||||
|
|| self.index_low >= self.index_high || self.lower_at_low > self.upper_at_low
|
||||||
|
|| self.lower_at_high > self.upper_at_high
|
||||||
|
{ return Err("index_market_cap_bounds_invalid".into()); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
pub fn band(&self, close: f64) -> Result<(f64, f64), String> {
|
||||||
|
self.validate()?;
|
||||||
|
if !close.is_finite() || close <= 0. { return Err("index_market_cap_close_invalid".into()); }
|
||||||
|
let t = (close.clamp(self.index_low,self.index_high) - self.index_low) / (self.index_high-self.index_low);
|
||||||
|
Ok((self.lower_at_low + t*(self.lower_at_high-self.lower_at_low),
|
||||||
|
self.upper_at_low + t*(self.upper_at_high-self.upper_at_low)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct IndexMarketCapRow { pub date: NaiveDate, pub close: f64 }
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Request {
|
||||||
|
pub policy: IndexMarketCapPolicy,
|
||||||
|
pub official_dates: Vec<NaiveDate>,
|
||||||
|
pub index_code: String,
|
||||||
|
pub closes: Vec<IndexMarketCapRow>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||||
|
pub struct Band { pub date: NaiveDate, pub index_close: f64, pub lower: f64, pub upper: f64 }
|
||||||
|
|
||||||
|
pub fn implementation_sha256() -> String { format!("{:x}", Sha256::digest(include_bytes!("stock_pool_market_cap.rs"))) }
|
||||||
|
|
||||||
|
pub fn evaluate(input: &Request) -> Result<Vec<Band>, String> {
|
||||||
|
input.policy.validate()?;
|
||||||
|
if input.index_code != input.policy.index_code || input.official_dates.is_empty()
|
||||||
|
|| input.official_dates.len() > 4000 || input.official_dates.len() != input.closes.len()
|
||||||
|
|| input.official_dates.windows(2).any(|pair| pair[0]>=pair[1])
|
||||||
|
|| input.closes.iter().zip(&input.official_dates).any(|(row, day)| row.date != *day)
|
||||||
|
{ return Err("index_market_cap_calendar_or_identity_mismatch".into()); }
|
||||||
|
input.closes.iter().map(|row| {
|
||||||
|
let (lower,upper)=input.policy.band(row.close)?;
|
||||||
|
Ok(Band{date:row.date,index_close:row.close,lower,upper})
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn policy()->IndexMarketCapPolicy {
|
||||||
|
serde_json::from_value(serde_json::json!({"schema_version":1,"index_code":"000300.SH","field":"market_cap","value_unit":"CNY",
|
||||||
|
"index_low":4000,"index_high":6000,"lower_at_low":2000000000_f64,"lower_at_high":3000000000_f64,
|
||||||
|
"upper_at_low":5000000000_f64,"upper_at_high":8000000000_f64})).unwrap()
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn interpolates_declared_endpoints_and_clamps_without_business_defaults(){
|
||||||
|
assert_eq!(policy().band(3000.).unwrap(),(2e9,5e9));
|
||||||
|
assert_eq!(policy().band(5000.).unwrap(),(2.5e9,6.5e9));
|
||||||
|
assert_eq!(policy().band(7000.).unwrap(),(3e9,8e9));
|
||||||
|
let mut decreasing=policy();decreasing.lower_at_low=3e9;decreasing.lower_at_high=2e9;
|
||||||
|
assert_eq!(decreasing.band(5000.).unwrap(),(2.5e9,6.5e9));
|
||||||
|
assert!(policy().band(f64::NAN).is_err());
|
||||||
|
let mut invalid=policy();invalid.value_unit="亿元".into();assert!(invalid.validate().is_err());
|
||||||
|
invalid=policy();invalid.index_high=4000.;assert!(invalid.validate().is_err());
|
||||||
|
invalid=policy();invalid.lower_at_low=9e9;assert!(invalid.validate().is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn missing_duplicate_or_mismatched_index_inputs_do_not_shrink_the_calendar(){
|
||||||
|
let day=NaiveDate::from_ymd_opt(2026,9,11).unwrap();
|
||||||
|
let mut input=Request{policy:policy(),official_dates:vec![day],index_code:"000300.SH".into(),closes:vec![IndexMarketCapRow{date:day,close:5000.}]};
|
||||||
|
assert_eq!(evaluate(&input).unwrap()[0].lower,2.5e9);
|
||||||
|
input.official_dates.push(day);assert!(evaluate(&input).is_err());input.official_dates.pop();
|
||||||
|
input.index_code="932000.CSI".into();assert!(evaluate(&input).is_err());
|
||||||
|
input.index_code="000300.SH".into();input.closes.clear();assert!(evaluate(&input).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,261 @@
|
|||||||
|
//! Durable intent progress, deliberately separate from actual-fill holding
|
||||||
|
//! protection. A published target starts no holding/protection timer.
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use rust_decimal::Decimal;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::stock_pool_execution::{
|
||||||
|
Position, StockPoolMemberSpec, StockPoolPlan, normalize_stock_symbol,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct StockPoolEntryProgress {
|
||||||
|
pub pending: bool,
|
||||||
|
pub observed_holding: bool,
|
||||||
|
pub first_decision_date: NaiveDate,
|
||||||
|
pub latest_generation: String,
|
||||||
|
pub latest_target_value: Decimal,
|
||||||
|
/// Fully funded entry goal, fixed at the last plan. Reconcile against
|
||||||
|
/// actual holdings before repricing, never against today's market value.
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub completion_quantity: Option<Decimal>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct StockPoolExecutionState {
|
||||||
|
pub schema_version: u32,
|
||||||
|
pub last_execution_date: Option<NaiveDate>,
|
||||||
|
pub entries: BTreeMap<String, StockPoolEntryProgress>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub last_target_weights: BTreeMap<String, i32>,
|
||||||
|
/// First signal excluding an actually held member; not an acquisition date.
|
||||||
|
pub removed_since: BTreeMap<String, NaiveDate>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct StockPoolGoalObservation<'a> {
|
||||||
|
pub symbol: &'a str,
|
||||||
|
pub target_weight_bps: i32,
|
||||||
|
pub target_value: Decimal,
|
||||||
|
pub current_quantity: Decimal,
|
||||||
|
pub target_quantity: Decimal,
|
||||||
|
pub status: &'a str,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for StockPoolExecutionState {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
schema_version: 1,
|
||||||
|
last_execution_date: None,
|
||||||
|
entries: BTreeMap::new(),
|
||||||
|
last_target_weights: BTreeMap::new(),
|
||||||
|
removed_since: BTreeMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl StockPoolExecutionState {
|
||||||
|
pub fn validate(&self) -> Result<(), String> {
|
||||||
|
if self.schema_version != 1
|
||||||
|
|| self.entries.len() > 10000
|
||||||
|
|| self.removed_since.len() > 10000
|
||||||
|
{
|
||||||
|
return Err("stock_pool_execution_state_invalid_schema_or_size".into());
|
||||||
|
}
|
||||||
|
for symbol in self
|
||||||
|
.entries
|
||||||
|
.keys()
|
||||||
|
.chain(self.removed_since.keys())
|
||||||
|
.chain(self.last_target_weights.keys())
|
||||||
|
{
|
||||||
|
if normalize_stock_symbol(symbol).as_ref() != Some(symbol) {
|
||||||
|
return Err("stock_pool_execution_state_invalid_symbol".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if self.last_target_weights.len() > 10000
|
||||||
|
|| self
|
||||||
|
.last_target_weights
|
||||||
|
.values()
|
||||||
|
.any(|value| !(0..=10000).contains(value))
|
||||||
|
{
|
||||||
|
return Err("stock_pool_execution_state_invalid_weights".into());
|
||||||
|
}
|
||||||
|
if self.entries.values().any(|entry| {
|
||||||
|
entry.latest_target_value < Decimal::ZERO
|
||||||
|
|| entry.completion_quantity.is_some_and(|quantity| quantity <= Decimal::ZERO)
|
||||||
|
|| entry.latest_generation.is_empty()
|
||||||
|
|| self
|
||||||
|
.last_execution_date
|
||||||
|
.is_none_or(|last| entry.first_decision_date > last)
|
||||||
|
}) || self
|
||||||
|
.removed_since
|
||||||
|
.values()
|
||||||
|
.any(|day| self.last_execution_date.is_none_or(|last| *day > last))
|
||||||
|
{
|
||||||
|
return Err("stock_pool_execution_state_invalid_goal_or_clock".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn observe(
|
||||||
|
&self,
|
||||||
|
decision_date: NaiveDate,
|
||||||
|
execution_date: NaiveDate,
|
||||||
|
official_dates: &[NaiveDate],
|
||||||
|
members: &[StockPoolMemberSpec],
|
||||||
|
positions: &[Position],
|
||||||
|
) -> Result<Self, String> {
|
||||||
|
self.validate()?;
|
||||||
|
if decision_date > execution_date
|
||||||
|
|| !official_dates.contains(&execution_date)
|
||||||
|
|| !official_dates.contains(&decision_date)
|
||||||
|
|| official_dates.windows(2).any(|pair| pair[0] >= pair[1])
|
||||||
|
|| self
|
||||||
|
.last_execution_date
|
||||||
|
.is_some_and(|last| last > execution_date)
|
||||||
|
{
|
||||||
|
return Err("stock_pool_execution_state_requires_monotone_official_clock".into());
|
||||||
|
}
|
||||||
|
let mut next = self.clone();
|
||||||
|
next.last_execution_date = Some(execution_date);
|
||||||
|
let members = members
|
||||||
|
.iter()
|
||||||
|
.map(|member| member.symbol.clone())
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
let held = positions
|
||||||
|
.iter()
|
||||||
|
.filter(|position| position.quantity > Decimal::ZERO)
|
||||||
|
.map(|position| position.symbol.clone())
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
next.entries.retain(|symbol, entry| {
|
||||||
|
// Confirmed flat starts a new cycle. A still-unfilled fresh target
|
||||||
|
// may remain pending while the latest pool still requests it.
|
||||||
|
!(entry.observed_holding && !held.contains(symbol))
|
||||||
|
&& (members.contains(symbol) || held.contains(symbol))
|
||||||
|
});
|
||||||
|
next.last_target_weights
|
||||||
|
.retain(|symbol, _| members.contains(symbol) || held.contains(symbol));
|
||||||
|
for (symbol, entry) in &mut next.entries {
|
||||||
|
entry.observed_holding |= held.contains(symbol);
|
||||||
|
if entry.pending
|
||||||
|
&& entry.completion_quantity.is_some_and(|goal| {
|
||||||
|
positions.iter().any(|position| {
|
||||||
|
&position.symbol == symbol && position.quantity >= goal
|
||||||
|
})
|
||||||
|
})
|
||||||
|
{
|
||||||
|
entry.pending = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
next.removed_since
|
||||||
|
.retain(|symbol, _| held.contains(symbol) && !members.contains(symbol));
|
||||||
|
for symbol in held.difference(&members) {
|
||||||
|
next.removed_since
|
||||||
|
.entry(symbol.clone())
|
||||||
|
.or_insert(decision_date);
|
||||||
|
}
|
||||||
|
next.validate()?;
|
||||||
|
Ok(next)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn pending_symbols(&self) -> BTreeSet<String> {
|
||||||
|
self.entries
|
||||||
|
.iter()
|
||||||
|
.filter(|(_, entry)| entry.pending)
|
||||||
|
.map(|(symbol, _)| symbol.clone())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn next_day_exit_symbols(&self, execution_date: NaiveDate) -> BTreeSet<String> {
|
||||||
|
self.removed_since
|
||||||
|
.iter()
|
||||||
|
.filter(|(_, removed)| **removed < execution_date)
|
||||||
|
.map(|(symbol, _)| symbol.clone())
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn record_plan(
|
||||||
|
&self,
|
||||||
|
decision_date: NaiveDate,
|
||||||
|
generation: &str,
|
||||||
|
plan: &StockPoolPlan,
|
||||||
|
) -> Result<Self, String> {
|
||||||
|
self.record_targets(
|
||||||
|
decision_date,
|
||||||
|
generation,
|
||||||
|
plan.rows.iter().map(|row| StockPoolGoalObservation {
|
||||||
|
symbol: &row.symbol,
|
||||||
|
target_weight_bps: row.target_weight_bps,
|
||||||
|
target_value: row.target_value,
|
||||||
|
current_quantity: row.current_quantity,
|
||||||
|
target_quantity: row.target_quantity,
|
||||||
|
status: &row.status,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn record_targets<'a>(
|
||||||
|
&self,
|
||||||
|
decision_date: NaiveDate,
|
||||||
|
generation: &str,
|
||||||
|
rows: impl IntoIterator<Item = StockPoolGoalObservation<'a>>,
|
||||||
|
) -> Result<Self, String> {
|
||||||
|
self.validate()?;
|
||||||
|
if generation.is_empty()
|
||||||
|
|| self
|
||||||
|
.last_execution_date
|
||||||
|
.is_none_or(|date| decision_date > date)
|
||||||
|
{
|
||||||
|
return Err("stock_pool_execution_state_plan_clock_invalid".into());
|
||||||
|
}
|
||||||
|
let mut next = self.clone();
|
||||||
|
for row in rows {
|
||||||
|
if row.target_weight_bps > 0 {
|
||||||
|
next.last_target_weights
|
||||||
|
.insert(row.symbol.into(), row.target_weight_bps);
|
||||||
|
}
|
||||||
|
let eligible = row.target_weight_bps > 0 && row.target_value > Decimal::ZERO;
|
||||||
|
let completion_quantity = (row.status == "READY"
|
||||||
|
&& row.target_quantity > row.current_quantity)
|
||||||
|
.then_some(row.target_quantity);
|
||||||
|
let satisfied = matches!(
|
||||||
|
row.status,
|
||||||
|
"ALREADY_SATISFIED"
|
||||||
|
| "ENTRY_TARGET_ALREADY_SATISFIED"
|
||||||
|
| "BELOW_MINIMUM_TRADE_UNIT_ALREADY_SATISFIED"
|
||||||
|
);
|
||||||
|
if row.current_quantity == Decimal::ZERO && eligible && satisfied {
|
||||||
|
next.entries.remove(row.symbol);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if let Some(entry) = next.entries.get_mut(row.symbol) {
|
||||||
|
entry.latest_generation = generation.into();
|
||||||
|
entry.latest_target_value = row.target_value;
|
||||||
|
if entry.pending && completion_quantity.is_some() {
|
||||||
|
entry.completion_quantity = completion_quantity;
|
||||||
|
}
|
||||||
|
entry.observed_holding |= row.current_quantity > Decimal::ZERO;
|
||||||
|
if entry.pending && eligible && satisfied {
|
||||||
|
entry.pending = false;
|
||||||
|
}
|
||||||
|
} else if eligible && row.current_quantity == Decimal::ZERO && !satisfied {
|
||||||
|
next.entries.insert(
|
||||||
|
row.symbol.into(),
|
||||||
|
StockPoolEntryProgress {
|
||||||
|
pending: true,
|
||||||
|
observed_holding: false,
|
||||||
|
first_decision_date: decision_date,
|
||||||
|
latest_generation: generation.into(),
|
||||||
|
latest_target_value: row.target_value,
|
||||||
|
completion_quantity,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
next.validate()?;
|
||||||
|
Ok(next)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1070,6 +1070,9 @@ pub enum TargetPortfolioOrderPricing {
|
|||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum OrderIntent {
|
pub enum OrderIntent {
|
||||||
|
StockPool {
|
||||||
|
contract: Box<crate::stock_pool_execution::FrozenStockPoolIntent>,
|
||||||
|
},
|
||||||
WithTimeInForce {
|
WithTimeInForce {
|
||||||
intent: Box<OrderIntent>,
|
intent: Box<OrderIntent>,
|
||||||
time_in_force: OrderTimeInForce,
|
time_in_force: OrderTimeInForce,
|
||||||
@@ -1231,6 +1234,7 @@ pub enum OrderIntent {
|
|||||||
impl OrderIntent {
|
impl OrderIntent {
|
||||||
fn collect_potential_buy_symbols(&self, open_orders: &[OpenOrderView], symbols: &mut BTreeSet<String>) {
|
fn collect_potential_buy_symbols(&self, open_orders: &[OpenOrderView], symbols: &mut BTreeSet<String>) {
|
||||||
match self.unwrapped() {
|
match self.unwrapped() {
|
||||||
|
Self::StockPool { contract } => { symbols.extend(contract.selection.requested_symbols.iter().cloned()); }
|
||||||
Self::Shares { symbol, quantity, .. } | Self::LimitShares { symbol, quantity, .. } if *quantity > 0 => { symbols.insert(symbol.clone()); }
|
Self::Shares { symbol, quantity, .. } | Self::LimitShares { symbol, quantity, .. } if *quantity > 0 => { symbols.insert(symbol.clone()); }
|
||||||
Self::Lots { symbol, lots, .. } | Self::LimitLots { symbol, lots, .. } if *lots > 0 => { symbols.insert(symbol.clone()); }
|
Self::Lots { symbol, lots, .. } | Self::LimitLots { symbol, lots, .. } if *lots > 0 => { symbols.insert(symbol.clone()); }
|
||||||
Self::TargetShares { symbol, target_quantity, .. } | Self::LimitTargetShares { symbol, target_quantity, .. } if *target_quantity > 0 => { symbols.insert(symbol.clone()); }
|
Self::TargetShares { symbol, target_quantity, .. } | Self::LimitTargetShares { symbol, target_quantity, .. } if *target_quantity > 0 => { symbols.insert(symbol.clone()); }
|
||||||
@@ -1311,6 +1315,7 @@ impl OrderIntent {
|
|||||||
|
|
||||||
pub fn supports_time_in_force(&self, time_in_force: OrderTimeInForce) -> bool {
|
pub fn supports_time_in_force(&self, time_in_force: OrderTimeInForce) -> bool {
|
||||||
let intent = self.unwrapped();
|
let intent = self.unwrapped();
|
||||||
|
if matches!(intent, Self::StockPool { .. }) { return time_in_force == OrderTimeInForce::Day; }
|
||||||
if matches!(
|
if matches!(
|
||||||
intent,
|
intent,
|
||||||
Self::CancelOrder { .. }
|
Self::CancelOrder { .. }
|
||||||
|
|||||||
@@ -1740,8 +1740,9 @@ fn broker_applies_price_ratio_slippage_on_snapshot_fills() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
fn broker_applies_explicit_historical_slippage_on_snapshot_fills() {
|
||||||
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
|
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
|
||||||
|
let previous_date = NaiveDate::from_ymd_opt(2024, 1, 9).unwrap();
|
||||||
let data = DataSet::from_components(
|
let data = DataSet::from_components(
|
||||||
vec![Instrument {
|
vec![Instrument {
|
||||||
symbol: "000002.SZ".to_string(),
|
symbol: "000002.SZ".to_string(),
|
||||||
@@ -1752,20 +1753,20 @@ fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
|||||||
delisted_at: None,
|
delisted_at: None,
|
||||||
status: "active".to_string(),
|
status: "active".to_string(),
|
||||||
}],
|
}],
|
||||||
vec![DailyMarketSnapshot {
|
[previous_date, date].into_iter().map(|day| DailyMarketSnapshot {
|
||||||
date,
|
date: day,
|
||||||
symbol: "000002.SZ".to_string(),
|
symbol: "000002.SZ".to_string(),
|
||||||
timestamp: Some("2024-01-10 10:18:00".to_string()),
|
timestamp: Some(format!("{day} 15:00:00")),
|
||||||
day_open: 10.0,
|
day_open: 10.0,
|
||||||
open: 10.0,
|
open: 10.0,
|
||||||
high: 10.1,
|
high: if day == previous_date { 10.1 } else { 10.9 },
|
||||||
low: 9.9,
|
low: if day == previous_date { 9.9 } else { 9.1 },
|
||||||
close: 10.0,
|
close: if day == previous_date { 10.0 } else { 10.8 },
|
||||||
last_price: 10.0,
|
last_price: 10.0,
|
||||||
bid1: 9.99,
|
bid1: 9.99,
|
||||||
ask1: 10.01,
|
ask1: 10.01,
|
||||||
prev_close: 10.0,
|
prev_close: 10.0,
|
||||||
volume: 100_000,
|
volume: if day == previous_date { 100_000 } else { 2_000_000 },
|
||||||
minute_volume: 100_000,
|
minute_volume: 100_000,
|
||||||
bid1_volume: 80_000,
|
bid1_volume: 80_000,
|
||||||
ask1_volume: 80_000,
|
ask1_volume: 80_000,
|
||||||
@@ -1774,7 +1775,7 @@ fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
|||||||
upper_limit: 11.0,
|
upper_limit: 11.0,
|
||||||
lower_limit: 9.0,
|
lower_limit: 9.0,
|
||||||
price_tick: 0.01,
|
price_tick: 0.01,
|
||||||
}],
|
}).collect(),
|
||||||
vec![DailyFactorSnapshot {
|
vec![DailyFactorSnapshot {
|
||||||
date,
|
date,
|
||||||
symbol: "000002.SZ".to_string(),
|
symbol: "000002.SZ".to_string(),
|
||||||
@@ -1786,8 +1787,8 @@ fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
|||||||
adjustment_factor_backward1: None,
|
adjustment_factor_backward1: None,
|
||||||
extra_factors: BTreeMap::new(),
|
extra_factors: BTreeMap::new(),
|
||||||
}],
|
}],
|
||||||
vec![CandidateEligibility {
|
[previous_date, date].into_iter().map(|day| CandidateEligibility {
|
||||||
date,
|
date: day,
|
||||||
symbol: "000002.SZ".to_string(),
|
symbol: "000002.SZ".to_string(),
|
||||||
is_st: false,
|
is_st: false,
|
||||||
is_star_st: false,
|
is_star_st: false,
|
||||||
@@ -1798,15 +1799,15 @@ fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
|||||||
is_kcb: false,
|
is_kcb: false,
|
||||||
is_one_yuan: false,
|
is_one_yuan: false,
|
||||||
risk_level_code: None,
|
risk_level_code: None,
|
||||||
}],
|
}).collect(),
|
||||||
vec![BenchmarkSnapshot {
|
[previous_date, date].into_iter().map(|day| BenchmarkSnapshot {
|
||||||
date,
|
date: day,
|
||||||
benchmark: "000300.SH".to_string(),
|
benchmark: "000300.SH".to_string(),
|
||||||
open: 100.0,
|
open: 100.0,
|
||||||
close: 100.0,
|
close: 100.0,
|
||||||
prev_close: 99.0,
|
prev_close: 99.0,
|
||||||
volume: 1_000_000,
|
volume: 1_000_000,
|
||||||
}],
|
}).collect(),
|
||||||
)
|
)
|
||||||
.expect("dataset");
|
.expect("dataset");
|
||||||
let mut portfolio = PortfolioState::new(1_000_000.0);
|
let mut portfolio = PortfolioState::new(1_000_000.0);
|
||||||
@@ -1815,7 +1816,9 @@ fn broker_applies_dynamic_slippage_on_snapshot_fills() {
|
|||||||
ChinaEquityRuleHooks::default(),
|
ChinaEquityRuleHooks::default(),
|
||||||
PriceField::Open,
|
PriceField::Open,
|
||||||
)
|
)
|
||||||
.with_slippage_model(SlippageModel::Dynamic(DynamicSlippageConfig::new(
|
.with_volume_limit(false)
|
||||||
|
.with_liquidity_limit(false)
|
||||||
|
.with_slippage_model(SlippageModel::HistoricalVolumeVolatility(DynamicSlippageConfig::new(
|
||||||
0.5, 0.3, 0.1,
|
0.5, 0.3, 0.1,
|
||||||
)));
|
)));
|
||||||
|
|
||||||
@@ -3077,23 +3080,24 @@ fn broker_executes_algo_twap_percent_across_window_quotes() {
|
|||||||
)
|
)
|
||||||
.expect("broker execution");
|
.expect("broker execution");
|
||||||
|
|
||||||
assert_eq!(report.fill_events.len(), 3);
|
assert_eq!(report.fill_events.len(), 2);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
report
|
report
|
||||||
.fill_events
|
.fill_events
|
||||||
.iter()
|
.iter()
|
||||||
.map(|fill| fill.quantity)
|
.map(|fill| fill.quantity)
|
||||||
.sum::<u32>(),
|
.sum::<u32>(),
|
||||||
300
|
200
|
||||||
);
|
);
|
||||||
assert!(report.fill_events.iter().all(|fill| fill.quantity == 100));
|
assert!(report.fill_events.iter().all(|fill| fill.quantity == 100));
|
||||||
|
assert!(report.fill_events.iter().all(|fill| fill.execution_timestamp.is_some_and(|at| at >= date.and_hms_opt(10, 15, 0).unwrap())));
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
report
|
report
|
||||||
.process_events
|
.process_events
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|event| event.kind == ProcessEventKind::Trade)
|
.filter(|event| event.kind == ProcessEventKind::Trade)
|
||||||
.count(),
|
.count(),
|
||||||
3
|
2
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,275 @@
|
|||||||
|
{
|
||||||
|
"strategyId": "fixture_hold_without_stops_backtest",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"market": "CN_A",
|
||||||
|
"benchmark": {
|
||||||
|
"instrumentId": "000300.SH",
|
||||||
|
"fallbackInstrumentId": "000300.SH",
|
||||||
|
"note": "必须使用真实指数链路;若 000852.SH 不可用,应直接报错而不是退化到其他标的。"
|
||||||
|
},
|
||||||
|
"universe": {
|
||||||
|
"exclude": [],
|
||||||
|
"implementationNotes": [
|
||||||
|
"ST、停牌、退市、新股、科创、一元、涨跌停、同日卖出禁买、成交量和费用由 riskPolicy / RiskLimits 统一执行",
|
||||||
|
"上市日期与退市日期取自 instrument 结构化字段,不再使用股票名称做 ST/退市判断",
|
||||||
|
"盘中 current_price / last_price 由策略交易时刻批量 tick 查询驱动"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"000001.SZ",
|
||||||
|
"000002.SZ"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"selectors": [
|
||||||
|
{
|
||||||
|
"type": "dynamicRange",
|
||||||
|
"field": "market_cap",
|
||||||
|
"lowerExpr": "0",
|
||||||
|
"upperExpr": "1000000000000",
|
||||||
|
"mapping": "close -> strategy_factory_source_lake.runtime_fields.close"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "filter",
|
||||||
|
"expr": "(close > 0)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "rank",
|
||||||
|
"orderBy": [
|
||||||
|
"market_cap asc"
|
||||||
|
],
|
||||||
|
"limitExpr": "2"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rebalance": {
|
||||||
|
"frequencyDays": 1,
|
||||||
|
"tradeTimes": [],
|
||||||
|
"dailyApproximation": "日线回测按 matching_type 撮合;分钟线回测按交易时刻分钟价格撮合",
|
||||||
|
"schedule": {
|
||||||
|
"frequency": "daily"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"risk": {
|
||||||
|
"takeProfitExpr": "",
|
||||||
|
"stopLossExpr": "",
|
||||||
|
"indexThrottleExpr": "max(0.0, 1.0000000000 - 0.0000 / max(total_equity, 1.0))",
|
||||||
|
"stopTakeReferencePriceMode": "position_average_entry_price"
|
||||||
|
},
|
||||||
|
"seasonality": {
|
||||||
|
"skipWindows": []
|
||||||
|
},
|
||||||
|
"execution": {
|
||||||
|
"selectionGranularity": "strategy_factory_source_lake.daily_source_rows_v1",
|
||||||
|
"executionGranularity": "daily_or_minute_bar",
|
||||||
|
"priceSource": "current_bar_close_or_next_bar_open_or_minute_bar",
|
||||||
|
"matchingType": "current_bar_close",
|
||||||
|
"rebalanceCashMode": "sell_then_buy",
|
||||||
|
"slippageModel": "none",
|
||||||
|
"slippageValue": 0,
|
||||||
|
"riskPolicy": {
|
||||||
|
"rejectStSelection": false,
|
||||||
|
"rejectStarStSelection": false,
|
||||||
|
"rejectPausedSelection": false,
|
||||||
|
"rejectInactiveSelection": false,
|
||||||
|
"rejectNewListingSelection": false,
|
||||||
|
"rejectKcbSelection": false,
|
||||||
|
"rejectBjseSelection": false,
|
||||||
|
"rejectOneYuanSelection": false,
|
||||||
|
"rejectUpperLimitSelection": false,
|
||||||
|
"rejectLowerLimitSelection": false,
|
||||||
|
"rejectStBuy": true,
|
||||||
|
"rejectStarStBuy": true,
|
||||||
|
"rejectPausedBuy": true,
|
||||||
|
"rejectInactiveBuy": true,
|
||||||
|
"rejectNewListingBuy": true,
|
||||||
|
"rejectKcbBuy": true,
|
||||||
|
"rejectBjseBuy": true,
|
||||||
|
"rejectOneYuanBuy": true,
|
||||||
|
"rejectUpperLimitBuy": true,
|
||||||
|
"rejectPausedSell": true,
|
||||||
|
"rejectInactiveSell": true,
|
||||||
|
"rejectLowerLimitSell": true,
|
||||||
|
"respectAllowBuySell": true,
|
||||||
|
"forbidSameDayRebuyAfterSell": true,
|
||||||
|
"blacklistEnabled": true,
|
||||||
|
"blacklistedSymbols": [],
|
||||||
|
"allowMarketOrders": true,
|
||||||
|
"liveTradingEnabled": false,
|
||||||
|
"volumeLimitEnabled": true,
|
||||||
|
"liquidityLimitEnabled": true,
|
||||||
|
"volumePercent": 0.25,
|
||||||
|
"maxOrderQuantity": 1000000,
|
||||||
|
"maxOrderNotional": 100000000,
|
||||||
|
"maxSymbolPosition": 10000000,
|
||||||
|
"commissionRate": 0.0003,
|
||||||
|
"minimumCommission": 5,
|
||||||
|
"stampTaxRateBeforeChange": 0.001,
|
||||||
|
"stampTaxRateAfterChange": 0.0005,
|
||||||
|
"stampTaxChangeDate": "2023-08-28"
|
||||||
|
},
|
||||||
|
"sourceLanguage": "engine-script",
|
||||||
|
"sourceKind": "platform-strategy",
|
||||||
|
"extractor": "omniquant-engine-script-v2",
|
||||||
|
"sellThenBuyDelaySlippageRate": 0,
|
||||||
|
"strictValueBudget": true
|
||||||
|
},
|
||||||
|
"factorRefs": [
|
||||||
|
"close"
|
||||||
|
],
|
||||||
|
"runtimeExpressions": {
|
||||||
|
"prelude": "",
|
||||||
|
"schedule": {
|
||||||
|
"frequency": "daily"
|
||||||
|
},
|
||||||
|
"selection": {
|
||||||
|
"limitExpr": "2",
|
||||||
|
"candidateLimitExpr": "2",
|
||||||
|
"marketCapField": "close",
|
||||||
|
"marketCapLowerExpr": "0",
|
||||||
|
"marketCapUpperExpr": "1000000000000",
|
||||||
|
"stockFilterExpr": "(close > 0)"
|
||||||
|
},
|
||||||
|
"risk": {
|
||||||
|
"exposureExpr": "max(0.0, 1.0000000000 - 0.0000 / max(total_equity, 1.0))",
|
||||||
|
"stopLossExpr": "",
|
||||||
|
"takeProfitExpr": "",
|
||||||
|
"stopTakeReferencePriceMode": "position_average_entry_price"
|
||||||
|
},
|
||||||
|
"allocation": {
|
||||||
|
"buyScaleExpr": "1.0"
|
||||||
|
},
|
||||||
|
"ordering": {
|
||||||
|
"rankBy": "market_cap",
|
||||||
|
"rankExpr": "(symbol == \"000001.SZ\" || symbol == \"000002.SZ\") ? (symbol == \"000001.SZ\" ? (0) : (1)) : 2",
|
||||||
|
"rankOrder": "asc"
|
||||||
|
},
|
||||||
|
"trading": {
|
||||||
|
"rotationEnabled": true,
|
||||||
|
"subscriptionGuardRequired": false,
|
||||||
|
"stage": "on_day",
|
||||||
|
"actions": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"engineConfig": {
|
||||||
|
"templateId": "fixture_hold_without_stops_backtest",
|
||||||
|
"benchmarkSymbol": "000300.SH",
|
||||||
|
"signalSymbol": "000300.SH",
|
||||||
|
"rankLimit": 2,
|
||||||
|
"refreshRate": 1,
|
||||||
|
"rsiRate": 1.0001,
|
||||||
|
"dynamicRange": {
|
||||||
|
"baseIndexLevel": 2000,
|
||||||
|
"baseCapFloor": 7,
|
||||||
|
"capSpan": 1000000000000,
|
||||||
|
"xs": 0.008
|
||||||
|
},
|
||||||
|
"stopLossMultiplier": null,
|
||||||
|
"takeProfitMultiplier": null,
|
||||||
|
"matchingType": "current_bar_close",
|
||||||
|
"rebalanceCashMode": "sell_then_buy",
|
||||||
|
"slippageModel": "none",
|
||||||
|
"slippageValue": 0,
|
||||||
|
"riskPolicy": {
|
||||||
|
"rejectStSelection": false,
|
||||||
|
"rejectStarStSelection": false,
|
||||||
|
"rejectPausedSelection": false,
|
||||||
|
"rejectInactiveSelection": false,
|
||||||
|
"rejectNewListingSelection": false,
|
||||||
|
"rejectKcbSelection": false,
|
||||||
|
"rejectBjseSelection": false,
|
||||||
|
"rejectOneYuanSelection": false,
|
||||||
|
"rejectUpperLimitSelection": false,
|
||||||
|
"rejectLowerLimitSelection": false,
|
||||||
|
"rejectStBuy": true,
|
||||||
|
"rejectStarStBuy": true,
|
||||||
|
"rejectPausedBuy": true,
|
||||||
|
"rejectInactiveBuy": true,
|
||||||
|
"rejectNewListingBuy": true,
|
||||||
|
"rejectKcbBuy": true,
|
||||||
|
"rejectBjseBuy": true,
|
||||||
|
"rejectOneYuanBuy": true,
|
||||||
|
"rejectUpperLimitBuy": true,
|
||||||
|
"rejectPausedSell": true,
|
||||||
|
"rejectInactiveSell": true,
|
||||||
|
"rejectLowerLimitSell": true,
|
||||||
|
"respectAllowBuySell": true,
|
||||||
|
"forbidSameDayRebuyAfterSell": true,
|
||||||
|
"blacklistEnabled": true,
|
||||||
|
"blacklistedSymbols": [],
|
||||||
|
"allowMarketOrders": true,
|
||||||
|
"liveTradingEnabled": false,
|
||||||
|
"volumeLimitEnabled": true,
|
||||||
|
"liquidityLimitEnabled": true,
|
||||||
|
"volumePercent": 0.25,
|
||||||
|
"maxOrderQuantity": 1000000,
|
||||||
|
"maxOrderNotional": 100000000,
|
||||||
|
"maxSymbolPosition": 10000000,
|
||||||
|
"commissionRate": 0.0003,
|
||||||
|
"minimumCommission": 5,
|
||||||
|
"stampTaxRateBeforeChange": 0.001,
|
||||||
|
"stampTaxRateAfterChange": 0.0005,
|
||||||
|
"stampTaxChangeDate": "2023-08-28"
|
||||||
|
},
|
||||||
|
"skipWindows": [],
|
||||||
|
"rebalanceSchedule": {
|
||||||
|
"frequency": "daily"
|
||||||
|
},
|
||||||
|
"dividendReinvestment": false,
|
||||||
|
"sellThenBuyDelaySlippageRate": 0,
|
||||||
|
"strictValueBudget": true
|
||||||
|
},
|
||||||
|
"stockPool": {
|
||||||
|
"schema_version": 1,
|
||||||
|
"pool_id": "fixture-pool",
|
||||||
|
"version_id": "fixture-version",
|
||||||
|
"members": [
|
||||||
|
{
|
||||||
|
"symbol": "000001.SZ",
|
||||||
|
"requested_order": 0,
|
||||||
|
"recommendation_reason": "",
|
||||||
|
"target_weight_bps": null,
|
||||||
|
"stop_loss": null,
|
||||||
|
"take_profit": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"symbol": "000002.SZ",
|
||||||
|
"requested_order": 1,
|
||||||
|
"recommendation_reason": "",
|
||||||
|
"target_weight_bps": null,
|
||||||
|
"stop_loss": null,
|
||||||
|
"take_profit": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"allocation_policy": {
|
||||||
|
"target_holding_count": 2,
|
||||||
|
"portfolio_policy": {
|
||||||
|
"schema_version": 1,
|
||||||
|
"membership": "retain_holdings",
|
||||||
|
"rebalance_weights": false
|
||||||
|
},
|
||||||
|
"invest_ratio_bps": 10000,
|
||||||
|
"reserve_cash": 0
|
||||||
|
},
|
||||||
|
"timing_policy": {
|
||||||
|
"schema_version": 1,
|
||||||
|
"auto_execute": true,
|
||||||
|
"freeze_time": "00:00",
|
||||||
|
"window_start": "09:30",
|
||||||
|
"window_end": "15:00",
|
||||||
|
"trigger_mode": "scheduled_bar",
|
||||||
|
"pricing_mode": "first_tick",
|
||||||
|
"automatic_trade_protection": {
|
||||||
|
"buy_protection_days": 0,
|
||||||
|
"sell_cooldown_days": 0,
|
||||||
|
"max_holding_days": 0,
|
||||||
|
"locks": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"stop_take_policy": {
|
||||||
|
"stop_loss": null,
|
||||||
|
"take_profit": null
|
||||||
|
},
|
||||||
|
"out_of_pool_policy": "hold"
|
||||||
|
},
|
||||||
|
"signalSymbol": "000300.SH",
|
||||||
|
"sourceCode": "strategy(\"fixture_hold_without_stops_backtest\") {\n mode(\"rotation\")\n market(\"CN_A\")\n benchmark(\"000300.SH\")\n signal(\"000300.SH\")\n rebalance.every_days(1)\n universe.include([\"000001.SZ\", \"000002.SZ\"])\n selection.limit(2)\n selection.candidate_limit(2)\n selection.market_cap_band(field=\"close\", lower=0, upper=1000000000000)\n filter.stock_expr(close > 0)\n ordering.rank_expr((symbol == \"000001.SZ\" || symbol == \"000002.SZ\") ? (symbol == \"000001.SZ\" ? (0) : (1)) : 2, \"asc\")\n risk.index_exposure(max(0.0, 1.0000000000 - 0.0000 / max(total_equity, 1.0)))\n allocation.buy_scale(1.0)\n stock_pool.config({\"schema_version\":1,\"pool_id\":\"fixture-pool\",\"version_id\":\"fixture-version\",\"members\":[{\"symbol\":\"000001.SZ\",\"requested_order\":0,\"recommendation_reason\":\"\",\"target_weight_bps\":null,\"stop_loss\":null,\"take_profit\":null},{\"symbol\":\"000002.SZ\",\"requested_order\":1,\"recommendation_reason\":\"\",\"target_weight_bps\":null,\"stop_loss\":null,\"take_profit\":null}],\"allocation_policy\":{\"target_holding_count\":2,\"portfolio_policy\":{\"schema_version\":1,\"membership\":\"retain_holdings\",\"rebalance_weights\":false},\"invest_ratio_bps\":10000,\"reserve_cash\":0},\"timing_policy\":{\"schema_version\":1,\"auto_execute\":true,\"freeze_time\":\"00:00\",\"window_start\":\"09:30\",\"window_end\":\"15:00\",\"trigger_mode\":\"scheduled_bar\",\"pricing_mode\":\"first_tick\",\"automatic_trade_protection\":{\"buy_protection_days\":0,\"sell_cooldown_days\":0,\"max_holding_days\":0,\"locks\":[]}},\"stop_take_policy\":{\"stop_loss\":null,\"take_profit\":null},\"out_of_pool_policy\":\"hold\"})\n risk.reference_price_mode(\"position_average_entry_price\")\n execution.matching_type(\"current_bar_close\")\n}\n",
|
||||||
|
"mode": "rotation"
|
||||||
|
}
|
||||||
@@ -0,0 +1,632 @@
|
|||||||
|
use chrono::NaiveDate;
|
||||||
|
use fidc_core::stock_pool_execution::*;
|
||||||
|
use fidc_core::{
|
||||||
|
BacktestConfig, BacktestEngine, BenchmarkSnapshot, BrokerSimulator, CandidateEligibility,
|
||||||
|
ChinaAShareCostModel, ChinaEquityRuleHooks, DailyFactorSnapshot, DailyMarketSnapshot, DataSet,
|
||||||
|
FidcRiskControlConfig, Instrument, MatchingType, OrderIntent, PlatformExprStrategy,
|
||||||
|
PortfolioState, PriceField, StrategyDecision, platform_expr_config_from_value,
|
||||||
|
};
|
||||||
|
use rust_decimal::Decimal;
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
|
||||||
|
fn day(n: u32) -> NaiveDate {
|
||||||
|
NaiveDate::from_ymd_opt(2026, 1, n).unwrap()
|
||||||
|
}
|
||||||
|
fn code(n: usize) -> String {
|
||||||
|
format!("{n:06}.SZ")
|
||||||
|
}
|
||||||
|
fn data(low_volume: bool) -> DataSet {
|
||||||
|
data_with_first_volume(if low_volume { 100 } else { 1_000_000 })
|
||||||
|
}
|
||||||
|
fn data_with_first_volume(first_volume: u64) -> DataSet {
|
||||||
|
data_with_suspension(first_volume, None)
|
||||||
|
}
|
||||||
|
fn data_with_suspension(first_volume: u64, suspension: Option<NaiveDate>) -> DataSet {
|
||||||
|
data_with_fund_rules(first_volume, suspension, false)
|
||||||
|
}
|
||||||
|
fn data_with_fund_rules(
|
||||||
|
first_volume: u64,
|
||||||
|
suspension: Option<NaiveDate>,
|
||||||
|
fund_rules: bool,
|
||||||
|
) -> DataSet {
|
||||||
|
let mut instruments: Vec<Instrument> = (1..=2)
|
||||||
|
.map(|n| Instrument {
|
||||||
|
symbol: code(n),
|
||||||
|
name: code(n),
|
||||||
|
board: if fund_rules && n == 2 {
|
||||||
|
"ETF".into()
|
||||||
|
} else {
|
||||||
|
"SZ".into()
|
||||||
|
},
|
||||||
|
round_lot: 100,
|
||||||
|
listed_at: Some(day(1)),
|
||||||
|
delisted_at: None,
|
||||||
|
status: "active".into(),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
instruments.push(Instrument {
|
||||||
|
symbol: "000300.SH".into(),
|
||||||
|
name: "fixture reference index".into(),
|
||||||
|
board: "INDEX".into(),
|
||||||
|
round_lot: 1,
|
||||||
|
listed_at: Some(day(1)),
|
||||||
|
delisted_at: None,
|
||||||
|
status: "active".into(),
|
||||||
|
});
|
||||||
|
let mut market = Vec::new();
|
||||||
|
let mut candidates = Vec::new();
|
||||||
|
for date in [day(2), day(5), day(6)] {
|
||||||
|
for n in 1..=2 {
|
||||||
|
let price = if fund_rules && n == 2 {
|
||||||
|
0.934
|
||||||
|
} else if n == 1 && date >= day(5) {
|
||||||
|
20.0
|
||||||
|
} else {
|
||||||
|
10.0
|
||||||
|
};
|
||||||
|
market.push(DailyMarketSnapshot {
|
||||||
|
date,
|
||||||
|
symbol: code(n),
|
||||||
|
timestamp: None,
|
||||||
|
day_open: price,
|
||||||
|
open: price,
|
||||||
|
high: price,
|
||||||
|
low: price,
|
||||||
|
close: price,
|
||||||
|
last_price: price,
|
||||||
|
bid1: price,
|
||||||
|
ask1: price,
|
||||||
|
prev_close: 10.,
|
||||||
|
volume: if n == 1 { first_volume } else { 1_000_000 },
|
||||||
|
minute_volume: 100_000,
|
||||||
|
bid1_volume: 100_000,
|
||||||
|
ask1_volume: 100_000,
|
||||||
|
trading_phase: None,
|
||||||
|
paused: n == 2 && suspension == Some(date),
|
||||||
|
upper_limit: 100.,
|
||||||
|
lower_limit: 0.1,
|
||||||
|
price_tick: if fund_rules && n == 2 { 0.001 } else { 0.01 },
|
||||||
|
});
|
||||||
|
candidates.push(CandidateEligibility {
|
||||||
|
date,
|
||||||
|
symbol: code(n),
|
||||||
|
is_st: false,
|
||||||
|
is_star_st: false,
|
||||||
|
is_new_listing: false,
|
||||||
|
is_paused: n == 2 && suspension == Some(date),
|
||||||
|
allow_buy: true,
|
||||||
|
allow_sell: true,
|
||||||
|
is_kcb: false,
|
||||||
|
is_one_yuan: false,
|
||||||
|
risk_level_code: None,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let mut reference = market.last().unwrap().clone();
|
||||||
|
reference.symbol = "000300.SH".into();
|
||||||
|
reference.day_open = 100.;
|
||||||
|
reference.open = 100.;
|
||||||
|
reference.high = 100.;
|
||||||
|
reference.low = 100.;
|
||||||
|
reference.close = 100.;
|
||||||
|
reference.last_price = 100.;
|
||||||
|
reference.bid1 = 100.;
|
||||||
|
reference.ask1 = 100.;
|
||||||
|
reference.prev_close = 100.;
|
||||||
|
reference.upper_limit = 1000.;
|
||||||
|
market.push(reference);
|
||||||
|
}
|
||||||
|
let benchmarks = [day(2), day(5), day(6)]
|
||||||
|
.into_iter()
|
||||||
|
.map(|date| BenchmarkSnapshot {
|
||||||
|
date,
|
||||||
|
benchmark: "000300.SH".into(),
|
||||||
|
open: 100.,
|
||||||
|
close: 100.,
|
||||||
|
prev_close: 100.,
|
||||||
|
volume: 1_000_000,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let factors = [day(2), day(5), day(6)]
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|date| {
|
||||||
|
(1..=2).map(move |n| DailyFactorSnapshot {
|
||||||
|
date,
|
||||||
|
symbol: code(n),
|
||||||
|
market_cap_bn: 10.,
|
||||||
|
free_float_cap_bn: 10.,
|
||||||
|
pe_ttm: 10.,
|
||||||
|
turnover_ratio: None,
|
||||||
|
effective_turnover_ratio: None,
|
||||||
|
adjustment_factor_backward1: Some(1.),
|
||||||
|
extra_factors: Default::default(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
DataSet::from_components(instruments, market, factors, candidates, benchmarks).unwrap()
|
||||||
|
}
|
||||||
|
fn broker(volume: bool) -> BrokerSimulator<ChinaAShareCostModel, ChinaEquityRuleHooks> {
|
||||||
|
let mut risk = FidcRiskControlConfig::default();
|
||||||
|
risk.trading_constraints.commission_rate = 0.;
|
||||||
|
risk.trading_constraints.minimum_commission = 0.;
|
||||||
|
risk.trading_constraints.transfer_fee_rate = 0.;
|
||||||
|
risk.trading_constraints.stamp_tax_rate_before_change = 0.;
|
||||||
|
risk.trading_constraints.stamp_tax_rate_after_change = 0.;
|
||||||
|
risk.trading_constraints.volume_limit_enabled = volume;
|
||||||
|
risk.trading_constraints.volume_percent = 0.25;
|
||||||
|
risk.trading_constraints.liquidity_limit_enabled = false;
|
||||||
|
BrokerSimulator::new(
|
||||||
|
ChinaAShareCostModel::from_trading_constraints(risk.trading_constraints),
|
||||||
|
ChinaEquityRuleHooks,
|
||||||
|
)
|
||||||
|
.with_matching_type(MatchingType::NextBarOpen)
|
||||||
|
.with_risk_config(risk)
|
||||||
|
}
|
||||||
|
fn contract(signal: NaiveDate, target: usize, preserve: bool) -> FrozenStockPoolIntent {
|
||||||
|
let symbols = vec![code(1), code(2)];
|
||||||
|
FrozenStockPoolIntent {
|
||||||
|
pool_id: "fixture-pool".into(),
|
||||||
|
signal_date: signal,
|
||||||
|
frozen_equity: Decimal::from(30000),
|
||||||
|
selection: StockPoolSelection {
|
||||||
|
trade_date: signal,
|
||||||
|
requested_symbols: symbols.clone(),
|
||||||
|
normal_trading_symbols: symbols.clone(),
|
||||||
|
risk_eligible_symbols: symbols,
|
||||||
|
final_symbols: vec![code(target)],
|
||||||
|
exclusion_reasons: BTreeMap::new(),
|
||||||
|
inherited_from_generation: None,
|
||||||
|
explicit_empty: false,
|
||||||
|
generation: Some(format!("g-{signal}")),
|
||||||
|
},
|
||||||
|
members: (1..=2)
|
||||||
|
.map(|n| StockPoolMemberSpec {
|
||||||
|
symbol: code(n),
|
||||||
|
requested_order: n as i32,
|
||||||
|
recommendation_reason: String::new(),
|
||||||
|
target_weight_bps: None,
|
||||||
|
stop_loss: None,
|
||||||
|
take_profit: None,
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
rule: StockPoolExecutionRule {
|
||||||
|
pricing_mode: POOL_PRICE_FIRST_TICK.into(),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
constraints: StockPoolDecisionConstraints {
|
||||||
|
target_holding_count: Some(1),
|
||||||
|
portfolio_policy: Some(StockPoolPortfolioPolicy {
|
||||||
|
schema_version: 1,
|
||||||
|
membership: MembershipPolicy::FollowCandidates,
|
||||||
|
rebalance_weights: !preserve,
|
||||||
|
}),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
invest_ratio_bps: 10000,
|
||||||
|
reserve_cash: Decimal::ZERO,
|
||||||
|
out_of_pool_policy: "hold".into(),
|
||||||
|
generation: format!("g-{signal}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn decision(contract: FrozenStockPoolIntent) -> StrategyDecision {
|
||||||
|
StrategyDecision {
|
||||||
|
order_intents: vec![OrderIntent::StockPool {
|
||||||
|
contract: Box::new(contract),
|
||||||
|
}],
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn paused_execution_day_keeps_the_prior_slot_and_never_submits_an_exit() {
|
||||||
|
let data = data_with_suspension(1_000_000, Some(day(6)));
|
||||||
|
let broker = broker(false);
|
||||||
|
let mut account = PortfolioState::new(30_000.);
|
||||||
|
let first = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(2), 2, false)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(first.fill_events.len(), 1);
|
||||||
|
let quantity = account.position(&code(2)).unwrap().quantity;
|
||||||
|
let mut replacement = contract(day(5), 1, false);
|
||||||
|
replacement
|
||||||
|
.members
|
||||||
|
.retain(|member| member.symbol != code(2));
|
||||||
|
replacement
|
||||||
|
.selection
|
||||||
|
.requested_symbols
|
||||||
|
.retain(|symbol| symbol != &code(2));
|
||||||
|
replacement.out_of_pool_policy = "reduce_to_zero_when_sellable".into();
|
||||||
|
let paused = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(6),
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(replacement),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(paused.fill_events.is_empty(), "{paused:?}");
|
||||||
|
assert_eq!(account.position(&code(2)).unwrap().quantity, quantity);
|
||||||
|
assert!(
|
||||||
|
paused
|
||||||
|
.diagnostics
|
||||||
|
.iter()
|
||||||
|
.any(|line| line.contains("MARKET_SUSPENDED"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mixed_fund_and_stock_round_trip_uses_declared_ticks_and_asset_specific_fees() {
|
||||||
|
let data = data_with_fund_rules(1_000_000, None, true);
|
||||||
|
let mut costs = ChinaAShareCostModel::default();
|
||||||
|
costs.set_transfer_fee_rate(0.00001);
|
||||||
|
let broker = BrokerSimulator::new(costs, ChinaEquityRuleHooks)
|
||||||
|
.with_matching_type(MatchingType::NextBarOpen);
|
||||||
|
let mut account = PortfolioState::new(30_000.);
|
||||||
|
let mut entry = contract(day(2), 1, false);
|
||||||
|
entry.selection.final_symbols = vec![code(1), code(2)];
|
||||||
|
entry.constraints.target_holding_count = Some(2);
|
||||||
|
entry.rule.buy_offset_bps = 1;
|
||||||
|
entry.rule.sell_offset_bps = -1;
|
||||||
|
let buys = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(entry.clone()),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(buys.fill_events.len(), 2, "{buys:?}");
|
||||||
|
let fund = buys
|
||||||
|
.fill_events
|
||||||
|
.iter()
|
||||||
|
.find(|fill| fill.symbol == code(2))
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(fund.quantity, 16000);
|
||||||
|
assert_eq!(fund.price, 0.934);
|
||||||
|
assert_eq!(fund.stamp_tax, 0.);
|
||||||
|
assert_eq!(fund.transfer_fee, 0.);
|
||||||
|
let stock = buys
|
||||||
|
.fill_events
|
||||||
|
.iter()
|
||||||
|
.find(|fill| fill.symbol == code(1))
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(stock.quantity, 700);
|
||||||
|
assert_eq!(stock.transfer_fee, 0.14);
|
||||||
|
entry.signal_date = day(5);
|
||||||
|
entry.selection.trade_date = day(5);
|
||||||
|
entry.generation = "exit".into();
|
||||||
|
entry.invest_ratio_bps = 0;
|
||||||
|
let sells = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(6),
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(entry),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(sells.fill_events.len(), 2, "{sells:?}");
|
||||||
|
let fund = sells
|
||||||
|
.fill_events
|
||||||
|
.iter()
|
||||||
|
.find(|fill| fill.symbol == code(2))
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(fund.stamp_tax, 0.);
|
||||||
|
assert_eq!(fund.transfer_fee, 0.);
|
||||||
|
let stock = sells
|
||||||
|
.fill_events
|
||||||
|
.iter()
|
||||||
|
.find(|fill| fill.symbol == code(1))
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(stock.stamp_tax, 7.);
|
||||||
|
assert_eq!(stock.transfer_fee, 0.14);
|
||||||
|
assert!(
|
||||||
|
(account.cash() - 29972.72).abs() < 0.000001,
|
||||||
|
"cash={}",
|
||||||
|
account.cash()
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
account
|
||||||
|
.positions()
|
||||||
|
.values()
|
||||||
|
.all(|position| position.quantity == 0)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn new_daily_target_sells_old_member_then_buys_using_frozen_equity() {
|
||||||
|
let data = data(false);
|
||||||
|
let broker = broker(false);
|
||||||
|
let mut account = PortfolioState::new(20000.);
|
||||||
|
account.position_mut(&code(1)).buy(day(2), 1000, 10.);
|
||||||
|
let report = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(2), 2, false)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(report.fill_events.len(), 2, "{report:?}");
|
||||||
|
assert!(account.position(&code(1)).is_none_or(|p| p.quantity == 0));
|
||||||
|
assert_eq!(account.position(&code(2)).unwrap().quantity, 3000);
|
||||||
|
assert!(
|
||||||
|
(account.cash() - 10000.).abs() < 1e-8,
|
||||||
|
"next-open equity must not replace the frozen 30000 budget"
|
||||||
|
);
|
||||||
|
let unique = report
|
||||||
|
.fill_events
|
||||||
|
.iter()
|
||||||
|
.map(|fill| (fill.symbol.clone(), format!("{:?}", fill.side)))
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
assert_eq!(unique.len(), 2);
|
||||||
|
let next = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(6),
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(5), 2, true)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(
|
||||||
|
next.fill_events.is_empty(),
|
||||||
|
"preserved shares must not be rebalanced: {next:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn partial_sell_does_not_release_a_slot_or_authorize_replacement() {
|
||||||
|
let data = data(true);
|
||||||
|
let broker = broker(true).with_matching_type(MatchingType::CurrentBarClose);
|
||||||
|
let mut account = PortfolioState::new(20000.);
|
||||||
|
account.position_mut(&code(1)).buy(day(2), 1000, 10.);
|
||||||
|
let report = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(2), 2, false)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(account.position(&code(2)).is_none());
|
||||||
|
assert_eq!(account.position(&code(1)).unwrap().quantity, 975);
|
||||||
|
assert!(
|
||||||
|
report
|
||||||
|
.diagnostics
|
||||||
|
.iter()
|
||||||
|
.any(|text| text.contains("DEFERRED_POSITION_SLOTS"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn actual_fill_protection_is_evaluated_on_execution_date() {
|
||||||
|
let data = data(false);
|
||||||
|
let broker = broker(false);
|
||||||
|
let mut account = PortfolioState::new(20000.);
|
||||||
|
account.position_mut(&code(1)).buy(day(2), 1000, 10.);
|
||||||
|
let mut intent = contract(day(2), 2, false);
|
||||||
|
intent.rule.automatic_trade_protection.buy_protection_days = 3;
|
||||||
|
let report = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(intent),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(report.fill_events.is_empty(), "{report:?}");
|
||||||
|
assert_eq!(account.position(&code(1)).unwrap().quantity, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parsed_pool_program_executes_daily_membership_changes_without_legacy_translation() {
|
||||||
|
let intent = contract(day(2), 1, false);
|
||||||
|
for quote_condition in ["", "price<5"] {
|
||||||
|
let program = StockPoolProgram {
|
||||||
|
schema_version: 1,
|
||||||
|
pool_id: "pool-fixture".into(),
|
||||||
|
version_id: "version-fixture".into(),
|
||||||
|
members: intent.members.clone(),
|
||||||
|
allocation_policy: serde_json::json!({"target_holding_count":1,"invest_ratio_bps":10000,"portfolio_policy":{"schema_version":1,"membership":"follow_candidates","rebalance_weights":false}}),
|
||||||
|
// Disabled natural trading must not disable an explicitly requested historical backtest.
|
||||||
|
timing_policy: serde_json::json!({"auto_execute":false,"pricing_mode":"first_tick","buy_condition":quote_condition}),
|
||||||
|
stop_take_policy: serde_json::json!({"stop_loss":null,"take_profit":0}),
|
||||||
|
out_of_pool_policy: "hold".into(),
|
||||||
|
};
|
||||||
|
let mut config=platform_expr_config_from_value("pool-fixture",&code(1),&serde_json::json!({
|
||||||
|
"stockPool":program,"signalSymbol":code(1),"benchmark":{"instrumentId":"000300.SH"},"universe":{"include":[code(1),code(2)]}
|
||||||
|
})).unwrap();
|
||||||
|
config.market_cap_field = "close".into();
|
||||||
|
config.market_cap_lower_expr = "0".into();
|
||||||
|
config.market_cap_upper_expr = "1000000000000".into();
|
||||||
|
config.stock_filter_expr = "true".into();
|
||||||
|
config.selection_limit_expr = "1".into();
|
||||||
|
config.selection_candidate_limit_expr = "2".into();
|
||||||
|
config.rank_expr = format!(
|
||||||
|
"decision_date == \"2026-01-02\" ? (symbol == \"{}\" ? 0 : 1) : (symbol == \"{}\" ? 0 : 1)",
|
||||||
|
code(1),
|
||||||
|
code(2)
|
||||||
|
);
|
||||||
|
config.matching_type = MatchingType::CurrentBarClose;
|
||||||
|
let result = BacktestEngine::new(
|
||||||
|
data(false),
|
||||||
|
PlatformExprStrategy::new(config),
|
||||||
|
broker(false).with_matching_type(MatchingType::CurrentBarClose),
|
||||||
|
BacktestConfig {
|
||||||
|
initial_cash: 30000.,
|
||||||
|
benchmark_code: "000300.SH".into(),
|
||||||
|
start_date: Some(day(2)),
|
||||||
|
end_date: Some(day(6)),
|
||||||
|
decision_lag_trading_days: 0,
|
||||||
|
execution_price_field: PriceField::Close,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.run()
|
||||||
|
.unwrap();
|
||||||
|
if quote_condition.is_empty() {
|
||||||
|
assert_eq!(
|
||||||
|
result.fills.len(),
|
||||||
|
3,
|
||||||
|
"fills={:#?}, decisions={:#?}, days={:#?}",
|
||||||
|
result.fills,
|
||||||
|
result.risk_decisions,
|
||||||
|
result
|
||||||
|
.equity_curve
|
||||||
|
.iter()
|
||||||
|
.map(|point| (&point.date, &point.diagnostics))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
);
|
||||||
|
assert_eq!(result.fills[0].symbol, code(1));
|
||||||
|
assert_eq!(result.fills[1].symbol, code(1));
|
||||||
|
assert_eq!(result.fills[2].symbol, code(2));
|
||||||
|
assert_eq!(result.fills[2].quantity, 6000);
|
||||||
|
} else {
|
||||||
|
assert!(
|
||||||
|
result.fills.is_empty(),
|
||||||
|
"configured quote condition must reach the actual executor"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn frontend_compiled_unset_stops_only_builds_positions_and_keeps_holding() {
|
||||||
|
// Generated by OmniQuant's actual handoff and compiler, not a hand-written
|
||||||
|
// replacement runtimeExpressions contract. It used to inject 0.93/1.07.
|
||||||
|
let spec: serde_json::Value = serde_json::from_str(include_str!(
|
||||||
|
"fixtures/stock_pool_disabled_stops_compiled.json"
|
||||||
|
))
|
||||||
|
.unwrap();
|
||||||
|
let config =
|
||||||
|
platform_expr_config_from_value("fixture_hold_without_stops", "000300.SH", &spec).unwrap();
|
||||||
|
assert!(config.stop_loss_expr.is_empty());
|
||||||
|
assert!(config.take_profit_expr.is_empty());
|
||||||
|
let result = BacktestEngine::new(
|
||||||
|
data(false),
|
||||||
|
PlatformExprStrategy::new(config),
|
||||||
|
broker(false).with_matching_type(MatchingType::CurrentBarClose),
|
||||||
|
BacktestConfig {
|
||||||
|
initial_cash: 30000.,
|
||||||
|
benchmark_code: "000300.SH".into(),
|
||||||
|
start_date: Some(day(2)),
|
||||||
|
end_date: Some(day(6)),
|
||||||
|
decision_lag_trading_days: 0,
|
||||||
|
execution_price_field: PriceField::Close,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.run()
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
result.fills.len(),
|
||||||
|
2,
|
||||||
|
"stock one doubles in price, but disabled stops and weight rebalancing must not sell it: {:?}",
|
||||||
|
result.fills
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
result
|
||||||
|
.fills
|
||||||
|
.iter()
|
||||||
|
.all(|fill| fill.side == fidc_core::OrderSide::Buy)
|
||||||
|
);
|
||||||
|
assert_eq!(result.equity_curve.len(), 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn partial_backtest_fills_do_not_turn_into_completed_preserved_holdings() {
|
||||||
|
let data = data_with_first_volume(2000);
|
||||||
|
let broker = broker(true).with_matching_type(MatchingType::CurrentBarClose);
|
||||||
|
let mut account = PortfolioState::new(30000.);
|
||||||
|
let first = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(2), 1, true)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let partial = account
|
||||||
|
.position(&code(1))
|
||||||
|
.map(|position| position.quantity)
|
||||||
|
.unwrap_or(0);
|
||||||
|
assert!(partial > 0 && partial < 3000, "{first:?}");
|
||||||
|
let second = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(contract(day(5), 1, true)),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(
|
||||||
|
account.position(&code(1)).unwrap().quantity > partial,
|
||||||
|
"partial entry must continue on the next valid execution: {second:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn next_day_outside_policy_executes_after_the_first_exclusion_signal() {
|
||||||
|
let data = data(false);
|
||||||
|
let broker = broker(false).with_matching_type(MatchingType::CurrentBarClose);
|
||||||
|
let mut account = PortfolioState::new(20000.);
|
||||||
|
account.position_mut(&code(1)).buy(day(1), 1000, 10.);
|
||||||
|
let outside = |signal| {
|
||||||
|
let mut value = contract(signal, 2, true);
|
||||||
|
value.members.retain(|member| member.symbol == code(2));
|
||||||
|
value.selection.requested_symbols = vec![code(2)];
|
||||||
|
value.selection.normal_trading_symbols = vec![code(2)];
|
||||||
|
value.selection.risk_eligible_symbols = vec![code(2)];
|
||||||
|
value.out_of_pool_policy = "reduce_next_trading_day".into();
|
||||||
|
value
|
||||||
|
};
|
||||||
|
let first = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
day(2),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(outside(day(2))),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(first.fill_events.is_empty(), "{first:?}");
|
||||||
|
let next = broker
|
||||||
|
.execute_with_event_dates(
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
day(5),
|
||||||
|
&mut account,
|
||||||
|
&data,
|
||||||
|
&decision(outside(day(5))),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(
|
||||||
|
account
|
||||||
|
.position(&code(1))
|
||||||
|
.is_none_or(|position| position.quantity == 0),
|
||||||
|
"{next:?}"
|
||||||
|
);
|
||||||
|
assert_eq!(account.position(&code(2)).unwrap().quantity, 3000);
|
||||||
|
}
|
||||||
@@ -0,0 +1,280 @@
|
|||||||
|
use chrono::NaiveDate;
|
||||||
|
use fidc_core::stock_pool_execution::*;
|
||||||
|
use fidc_core::stock_pool_state::StockPoolExecutionState;
|
||||||
|
use rust_decimal::Decimal;
|
||||||
|
use serde_json::json;
|
||||||
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
fn day(value: u32) -> NaiveDate {
|
||||||
|
NaiveDate::from_ymd_opt(2026, 9, value).unwrap()
|
||||||
|
}
|
||||||
|
fn member() -> StockPoolMemberSpec {
|
||||||
|
StockPoolMemberSpec {
|
||||||
|
symbol: "000001.SZ".into(),
|
||||||
|
requested_order: 0,
|
||||||
|
recommendation_reason: String::new(),
|
||||||
|
target_weight_bps: None,
|
||||||
|
stop_loss: None,
|
||||||
|
take_profit: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn held(quantity: i64, closable: i64) -> Position {
|
||||||
|
Position {
|
||||||
|
symbol: "000001.SZ".into(),
|
||||||
|
quantity: quantity.into(),
|
||||||
|
closable_quantity: closable.into(),
|
||||||
|
average_cost: 10.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn quote() -> MarketSnapshot {
|
||||||
|
MarketSnapshot {
|
||||||
|
symbol: "000001.SZ".into(),
|
||||||
|
last_price: 10.into(),
|
||||||
|
prev_close: Some(10.into()),
|
||||||
|
volume: Some(1000000.into()),
|
||||||
|
turnover: Some(10000000.into()),
|
||||||
|
bid_price_1: Some(10.into()),
|
||||||
|
ask_price_1: Some(10.into()),
|
||||||
|
is_kcb: Some(false),
|
||||||
|
instrument_rules: None,
|
||||||
|
buy_sizing_price: None,
|
||||||
|
sell_sizing_price: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn plan(
|
||||||
|
state: &StockPoolExecutionState,
|
||||||
|
at: NaiveDate,
|
||||||
|
members: &[StockPoolMemberSpec],
|
||||||
|
positions: &[Position],
|
||||||
|
cash: i64,
|
||||||
|
outside: &str,
|
||||||
|
) -> StockPoolPlan {
|
||||||
|
plan_at_price(state, at, members, positions, cash, outside, 10)
|
||||||
|
}
|
||||||
|
fn plan_at_price(
|
||||||
|
state: &StockPoolExecutionState,
|
||||||
|
at: NaiveDate,
|
||||||
|
members: &[StockPoolMemberSpec],
|
||||||
|
positions: &[Position],
|
||||||
|
cash: i64,
|
||||||
|
outside: &str,
|
||||||
|
price: i64,
|
||||||
|
) -> StockPoolPlan {
|
||||||
|
let symbols = members
|
||||||
|
.iter()
|
||||||
|
.map(|member| member.symbol.clone())
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let selection = StockPoolSelection {
|
||||||
|
trade_date: at,
|
||||||
|
requested_symbols: symbols.clone(),
|
||||||
|
normal_trading_symbols: symbols.clone(),
|
||||||
|
risk_eligible_symbols: symbols.clone(),
|
||||||
|
final_symbols: symbols,
|
||||||
|
exclusion_reasons: BTreeMap::new(),
|
||||||
|
inherited_from_generation: None,
|
||||||
|
explicit_empty: false,
|
||||||
|
generation: Some("same-goal".into()),
|
||||||
|
};
|
||||||
|
let mut constraints = stock_pool_constraints_from_configuration(
|
||||||
|
&json!({"top_n_rebalance_policy":"preserve_existing"}),
|
||||||
|
&json!({}),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
constraints.pending_entry_symbols = state.pending_symbols();
|
||||||
|
constraints.next_day_outside_exit_symbols = state.next_day_exit_symbols(at);
|
||||||
|
let mut market = quote();
|
||||||
|
market.last_price = price.into();
|
||||||
|
market.bid_price_1 = Some(price.into());
|
||||||
|
market.ask_price_1 = Some(price.into());
|
||||||
|
build_stock_pool_target_plan_with_constraints(
|
||||||
|
&selection,
|
||||||
|
members,
|
||||||
|
&StockPoolExecutionRule::default(),
|
||||||
|
&AccountSnapshot {
|
||||||
|
total_equity: 10000.into(),
|
||||||
|
cash: cash.into(),
|
||||||
|
frozen_cash: Decimal::ZERO,
|
||||||
|
},
|
||||||
|
positions,
|
||||||
|
&[market],
|
||||||
|
10000,
|
||||||
|
Decimal::ZERO,
|
||||||
|
outside,
|
||||||
|
"preserve_existing",
|
||||||
|
&constraints,
|
||||||
|
"same-goal",
|
||||||
|
Decimal::ZERO,
|
||||||
|
Decimal::ZERO,
|
||||||
|
Decimal::ZERO,
|
||||||
|
)
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fully_filled_entry_is_not_reopened_when_price_falls_before_next_observation() {
|
||||||
|
let members = vec![member()];
|
||||||
|
let calendar = vec![day(11), day(14)];
|
||||||
|
let initial = StockPoolExecutionState::default()
|
||||||
|
.observe(day(11), day(11), &calendar, &members, &[]).unwrap();
|
||||||
|
let first_plan = plan(&initial, day(11), &members, &[], 10000, "hold");
|
||||||
|
let state = initial.record_plan(day(11), "first-entry", &first_plan).unwrap();
|
||||||
|
assert_eq!(state.entries["000001.SZ"].completion_quantity, Some(1000.into()));
|
||||||
|
let state: StockPoolExecutionState = serde_json::from_slice(&serde_json::to_vec(&state).unwrap()).unwrap();
|
||||||
|
let observed = state.observe(day(14), day(14), &calendar, &members, &[held(1000, 1000)]).unwrap();
|
||||||
|
assert!(!observed.pending_symbols().contains("000001.SZ"));
|
||||||
|
let next = plan_at_price(&observed, day(14), &members, &[held(1000, 1000)], 1000, "hold", 8);
|
||||||
|
assert_eq!(next.rows[0].target_quantity, 1000.into());
|
||||||
|
assert_eq!(next.rows[0].delta_quantity, Decimal::ZERO);
|
||||||
|
assert_eq!(next.rows[0].status, "PRESERVED_EXISTING_POSITION");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cash_clipped_or_rejected_entry_does_not_claim_full_completion() {
|
||||||
|
let members = vec![member()];
|
||||||
|
let calendar = vec![day(11), day(14)];
|
||||||
|
let initial = StockPoolExecutionState::default()
|
||||||
|
.observe(day(11), day(11), &calendar, &members, &[]).unwrap();
|
||||||
|
let first_plan = plan(&initial, day(11), &members, &[], 5000, "hold");
|
||||||
|
assert_eq!(first_plan.rows[0].status, "REDUCE_TO_ALLOWED_QUANTITY");
|
||||||
|
let state = initial.record_plan(day(11), "limited-entry", &first_plan).unwrap();
|
||||||
|
assert_eq!(state.entries["000001.SZ"].completion_quantity, None);
|
||||||
|
for quantity in [0, 500] {
|
||||||
|
let positions = if quantity == 0 { vec![] } else { vec![held(quantity, quantity)] };
|
||||||
|
let observed = state.observe(day(14), day(14), &calendar, &members, &positions).unwrap();
|
||||||
|
assert!(observed.pending_symbols().contains("000001.SZ"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn legacy_state_without_quantity_keeps_its_serialized_identity() {
|
||||||
|
let original = json!({
|
||||||
|
"schema_version":1,"last_execution_date":"2026-09-11",
|
||||||
|
"entries":{"000001.SZ":{"pending":true,"observed_holding":false,
|
||||||
|
"first_decision_date":"2026-09-11","latest_generation":"legacy",
|
||||||
|
"latest_target_value":"10000"}},"last_target_weights":{},"removed_since":{}
|
||||||
|
});
|
||||||
|
let state: StockPoolExecutionState = serde_json::from_value(original.clone()).unwrap();
|
||||||
|
state.validate().unwrap();
|
||||||
|
assert_eq!(serde_json::to_value(state).unwrap(), original);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn partial_entry_continues_after_restart_then_completed_holdings_are_preserved() {
|
||||||
|
let members = vec![member()];
|
||||||
|
let calendar = vec![day(11), day(14)];
|
||||||
|
let first = StockPoolExecutionState::default()
|
||||||
|
.observe(day(11), day(11), &calendar, &members, &[])
|
||||||
|
.unwrap();
|
||||||
|
let initial = plan(&first, day(11), &members, &[], 10000, "hold");
|
||||||
|
assert_eq!(initial.rows[0].target_quantity, 1000.into());
|
||||||
|
let pending = first.record_plan(day(11), "same-goal", &initial).unwrap();
|
||||||
|
assert!(pending.entries["000001.SZ"].pending);
|
||||||
|
assert!(!pending.entries["000001.SZ"].observed_holding);
|
||||||
|
let persisted = serde_json::to_vec(&pending).unwrap();
|
||||||
|
let restored: StockPoolExecutionState = serde_json::from_slice(&persisted).unwrap();
|
||||||
|
let partial = restored
|
||||||
|
.observe(day(11), day(11), &calendar, &members, &[held(500, 0)])
|
||||||
|
.unwrap();
|
||||||
|
let retry = plan(&partial, day(11), &members, &[held(500, 0)], 5000, "hold");
|
||||||
|
assert_eq!(retry.rows[0].delta_quantity, 500.into(), "{retry:?}");
|
||||||
|
let pending = partial.record_plan(day(11), "same-goal", &retry).unwrap();
|
||||||
|
assert!(pending.entries["000001.SZ"].pending);
|
||||||
|
let filled = pending
|
||||||
|
.observe(day(14), day(14), &calendar, &members, &[held(1000, 1000)])
|
||||||
|
.unwrap();
|
||||||
|
let satisfied = plan(&filled, day(14), &members, &[held(1000, 1000)], 0, "hold");
|
||||||
|
assert_eq!(satisfied.rows[0].status, "PRESERVED_EXISTING_POSITION");
|
||||||
|
let completed = filled.record_plan(day(14), "new-day", &satisfied).unwrap();
|
||||||
|
assert!(!completed.entries["000001.SZ"].pending);
|
||||||
|
assert_eq!(
|
||||||
|
plan(
|
||||||
|
&completed,
|
||||||
|
day(14),
|
||||||
|
&members,
|
||||||
|
&[held(1000, 1000)],
|
||||||
|
0,
|
||||||
|
"hold"
|
||||||
|
)
|
||||||
|
.rows[0]
|
||||||
|
.status,
|
||||||
|
"PRESERVED_EXISTING_POSITION"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn removal_anchor_is_not_reset_by_rechecks_weekends_or_t_plus_one() {
|
||||||
|
let calendar = vec![day(11), day(14), day(15)];
|
||||||
|
let positions = vec![held(1000, 1000)];
|
||||||
|
let removed = StockPoolExecutionState::default()
|
||||||
|
.observe(day(11), day(11), &calendar, &[], &positions)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(removed.removed_since["000001.SZ"], day(11));
|
||||||
|
assert_eq!(
|
||||||
|
plan(
|
||||||
|
&removed,
|
||||||
|
day(11),
|
||||||
|
&[],
|
||||||
|
&positions,
|
||||||
|
0,
|
||||||
|
"reduce_next_trading_day"
|
||||||
|
)
|
||||||
|
.rows[0]
|
||||||
|
.status,
|
||||||
|
"DEFERRED_T_PLUS_ONE"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
removed
|
||||||
|
.observe(day(12), day(12), &calendar, &[], &positions)
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
let restored: StockPoolExecutionState =
|
||||||
|
serde_json::from_str(&serde_json::to_string(&removed).unwrap()).unwrap();
|
||||||
|
let monday = restored
|
||||||
|
.observe(day(14), day(14), &calendar, &[], &[held(1000, 0)])
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(monday.removed_since["000001.SZ"], day(11));
|
||||||
|
assert_eq!(
|
||||||
|
plan(
|
||||||
|
&monday,
|
||||||
|
day(14),
|
||||||
|
&[],
|
||||||
|
&[held(1000, 0)],
|
||||||
|
0,
|
||||||
|
"reduce_next_trading_day"
|
||||||
|
)
|
||||||
|
.rows[0]
|
||||||
|
.delta_quantity,
|
||||||
|
Decimal::ZERO
|
||||||
|
);
|
||||||
|
let next = monday
|
||||||
|
.observe(day(15), day(15), &calendar, &[], &positions)
|
||||||
|
.unwrap();
|
||||||
|
let exit = plan(
|
||||||
|
&next,
|
||||||
|
day(15),
|
||||||
|
&[],
|
||||||
|
&positions,
|
||||||
|
0,
|
||||||
|
"reduce_next_trading_day",
|
||||||
|
);
|
||||||
|
assert_eq!(exit.rows[0].target_quantity, Decimal::ZERO);
|
||||||
|
assert_eq!(exit.rows[0].side, Some(OrderSide::Sell));
|
||||||
|
let returned = next
|
||||||
|
.observe(day(15), day(15), &calendar, &[member()], &positions)
|
||||||
|
.unwrap();
|
||||||
|
assert!(returned.removed_since.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cloned_preview_does_not_start_a_timer_and_next_open_uses_signal_removal_date() {
|
||||||
|
let state = StockPoolExecutionState::default();
|
||||||
|
let calendar = vec![day(11), day(14)];
|
||||||
|
let preview = state
|
||||||
|
.observe(day(11), day(14), &calendar, &[], &[held(1000, 1000)])
|
||||||
|
.unwrap();
|
||||||
|
assert!(state.removed_since.is_empty());
|
||||||
|
assert!(preview.next_day_exit_symbols(day(14)).contains("000001.SZ"));
|
||||||
|
let mut invalid = preview;
|
||||||
|
invalid.schema_version = 0;
|
||||||
|
assert!(invalid.validate().is_err());
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# 逐成交腿价格风控验收
|
||||||
|
|
||||||
|
## 修复范围
|
||||||
|
|
||||||
|
Engine `7e0877b5860d8724da1c4507a1d1ba393b3497f5`,Trading `1f7bc074024191cfaa5975546f22c2c2c733602a`,均以 tag `v2026.9.11.2` 发布177。
|
||||||
|
|
||||||
|
- 回测在每条实际报价进入撮合前检查原始参考价,滑点和限价处理后再次检查最终价。买入一元股、买入涨停、卖出跌停以及无效价格均按本腿价格处理,不能只依赖最初下单的日线标记或价格。
|
||||||
|
- Paper和Live的订单前检查与Paper撮合共用`MarketSnapshot::execution_reference_price`:普通买入用卖一、卖出用买一;未提供该侧价格时保留既有最新价合同,显式0或负数不当缺失处理、不回退。
|
||||||
|
- 选股仍独立使用其日线最新价与显式规则,不被买卖盘差异改写。盘后固定价仍使用原正式收盘价合同。
|
||||||
|
- Paper已接受/部分成交订单在新报价到达时重新检查。后续被风控拒绝不删除或回滚此前真实模拟成交,不重复扣资金或手续费。
|
||||||
|
- 实盘这里只验证发单前路径;券商实际成交事实必须原样保存,不能声称本地检查能保证委托进入券商后市场不再变化。本轮未提交证券订单。
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- 原始报价0.9、正向滑点20%后为1.08,仍不得利用滑点绕过一元股规则。
|
||||||
|
- 先出现0.9、后出现1.2的报价,只允许在后一个实际时点成交;不回写到前一时点。
|
||||||
|
- 限价滑点将最终执行价变为0.9时仍拒绝;显式关闭一元股买入规则后放行;卖出不继承买入一元股规则。
|
||||||
|
- 最后价10而卖一11触及涨停:买入拒绝。最后价11而卖一10.5:执行检查不按旧最后价误拒;显式选股涨停规则仍可按最后价拒绝。
|
||||||
|
- 最后价10而买一9触及跌停:卖出拒绝。最后价9而买一9.5:执行检查不按旧最后价误拒。
|
||||||
|
- 原挂单/部分成交后,最后价1.1但卖一0.9:余单拒绝,既有成交数和现金保持不变。
|
||||||
|
|
||||||
|
177测试:Engine 667通过/8忽略,Trading工作区548通过/10忽略,Runner370通过/3忽略,API99通过/1忽略。新场景使用隔离合成账户/报价,未以此冒充原始市场样本。
|
||||||
|
|
||||||
|
## 真实分钟回放
|
||||||
|
|
||||||
|
- 同一冻结请求、信号及bundle,2025-01-03至2025-01-06,分钟13:07,初始10,000,000,滑点0.002,佣金万三/最低5,分钟25%量约束不改。
|
||||||
|
- 原基准 `btr_1789074235759_2081201_1`。
|
||||||
|
- 新运行 `btr_1789093974375_2601124_0`。
|
||||||
|
- 均21成交、11个最终持仓,最终资产9,968,551.588547;订单、成交、账户、权益、持仓和风险审计六项canonical完全一致。
|
||||||
|
- 总SHA `a1aa004f544b34eae0ade41e849a0fd067e39600d1c4ad1a127f5a3d6a79be11`。
|
||||||
|
- 服务端3.490秒,客户端提交/读取/轮询16.927秒。未采集客户端各子段,不能把差值归因到某个具体服务,也不与原报告“提交后轮询耗时”混比。缓存条件的短样本不能外推冷态或多年性能。
|
||||||
|
|
||||||
|
## 发布与状态
|
||||||
|
|
||||||
|
通过官方Backtest和Trading installer构建和发布,没有调用Source/因子重启入口。Backtest service源码仍`75202cc3b876daf99d0d2dffb988ca456c34aabf`并重新链接上述engine。运行二进制SHA与清单一致。
|
||||||
|
|
||||||
|
本轮发布前10:27已观测到3Paper/0Live,重复读取确认;这不同于上一轮的3Paper/1Live,不是本次发布删除。本轮没有新建、恢复或删除实例。发布后仍3Paper/0Live,完整配置/状态摘要与本轮发布前相同。
|
||||||
|
|
||||||
|
Source主PID2267019和因子主PID2178403、NRestarts不变。发布后样本Paper9行、Live11行无WARN/ERROR,Runtime0行不能视为实际执行成功;行情`/readyz`仍503,THS -4302配额问题未恢复。
|
||||||
|
|
||||||
|
## 未完成
|
||||||
|
|
||||||
|
next-open全天量容量和动态滑点使用全天high/low/volume的问题没有被本次修复覆盖,仍按P0时点问题处理。新的执行观察规格位于`/Users/boris/WorkSpace/docs/fidc/execution-observation-prd-20260911.md`,只是后续实现规格,不是已部署能力。禁止静默改用昨量、自动关闭风控、修改旧结果或把后续一分钟量回填到开盘。
|
||||||
|
|
||||||
|
自然Paper/Live还需要合格模型、正式审批和真实可用行情;不开放2026封存,不替研究模型审批。当前实盘列表为空,不自行补建。
|
||||||
|
|
||||||
|
## 证据
|
||||||
|
|
||||||
|
`/srv/fidc/canonical/run/research/execution-leg-risk-20260911/`:
|
||||||
|
|
||||||
|
- `engine-focused.log`、`engine-full.log`、`trading-full.log`、`backtest-full.log`。
|
||||||
|
- `minute-replay/request.json`、`submission.json`、`result.json`、`comparison.json`。
|
||||||
|
- `deploy-before.json`、`deploy-after.json`、`running-binary-verification.json`、`post-deploy-log-audit.json`。
|
||||||
|
- 官方部署日志、研究审计脚本与执行观察设计稿。不改旧证据目录和WFT V18制品。
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
# 执行价风控与共享信号账户隔离验收
|
||||||
|
|
||||||
|
## 结论
|
||||||
|
|
||||||
|
本次修复已通过测试并发布 177。只证明一元股请求阶段价格修复、同一共享信号的账户隔离和既有真实样本结果不变;完整生产闭环尚未完成。next-open 全天容量、动态滑点的日内可见性及逐成交腿风控仍是未关闭项,不能称为全部成交无未来信息。
|
||||||
|
|
||||||
|
## 修复
|
||||||
|
|
||||||
|
- `risk_control.rs` 的 Buy 一元股规则改用本次 `check_price`,不再读取日线 `is_one_yuan` 或当天更早的 `day_open`。无效价格拒绝,其他缺失风险事实仍拒绝;显式 Selection 规则保留。
|
||||||
|
- Trading 共用 `risk.rs` 的 Paper/Live 订单前检查使用新鲜 `last_price`,不再被日线标记或开盘价覆盖。选股阶段的开关和日线标记单独处理。
|
||||||
|
- 缺执行价格继续输出具体 `missing_execution_price field=open`,保留 `historical_price_fallback=false`;停牌等权威状态仍优先,不因新通用校验丢失根因。
|
||||||
|
- 没有修改共享信号内容、模型、账号权限、运行配置、Source Lake、研究 checkpoint 或既有回测数据。
|
||||||
|
|
||||||
|
## 账户隔离组合
|
||||||
|
|
||||||
|
隔离共享核心测试使用同一份经过原生校验的 `fidc.signal-book/v2`,信号只表达保留 50% 持仓。当前价 10、止损 10%、止盈 20%;每个账户独立计算实际订单。
|
||||||
|
|
||||||
|
| 原数量 | 买入价 | 买入费用总额 | 预期剩余 | 结果 |
|
||||||
|
| ---: | ---: | ---: | ---: | --- |
|
||||||
|
| 1,000 | 8.00 | 0 | 0 | 止盈优先于半仓目标 |
|
||||||
|
| 1,000 | 10.00 | 0 | 500 | 按本账户数量减半 |
|
||||||
|
| 3,000 | 10.00 | 0 | 1,500 | 不共用其他账户数量 |
|
||||||
|
| 1,000 | 12.00 | 0 | 0 | 止损 |
|
||||||
|
| 1,000 | 11.11 | 0 | 500 | 尚未跨过止损阈值 |
|
||||||
|
| 1,000 | 11.11 | 2.00 | 0 | 含费用成本跨过止损阈值 |
|
||||||
|
|
||||||
|
六种账户卖出后,当天再消费同一买入目标均不得买回;独立未卖出账户可正常买入。同一信号版本不变,策略规划不预先修改持仓。这些是隔离合成账户测试,不是券商委托/成交证据。
|
||||||
|
|
||||||
|
## 回归与真实回放
|
||||||
|
|
||||||
|
- Engine:656 通过,8 个专用测试忽略。
|
||||||
|
- Trading 工作区:537 通过,9 个专用测试忽略。
|
||||||
|
- Backtest Runner:370 通过、3 忽略;API:99 通过、1 忽略。
|
||||||
|
- 一元股专项覆盖真实执行价为 0.9/1.0/1.2、旧标记与新价格相反、缺失其他风险事实、NaN/无效价及开关独立性。
|
||||||
|
|
||||||
|
实际 HTTP 回测使用原始冻结请求、信号和 bundle,未复制结果:
|
||||||
|
|
||||||
|
- 原基准:`btr_req_260d0f3179d40fda5c918d48eba0a239bd335406c82a1cbe`。
|
||||||
|
- 新运行:`btr_1789091571964_2429476_0`。
|
||||||
|
- 区间:2025-02-05 至 2025-02-10;初始资金 10,000,000;目标 10 仓;next-open;滑点 0.002;佣金万三、最低 5。
|
||||||
|
- 两次均 28 成交,最终资产 10,089,448.918844,收益 0.89448918844%。
|
||||||
|
- 订单、成交、账户事件、权益、持仓、风险审计六项摘要相同。
|
||||||
|
- Canonical SHA256:`befa50b3ec5b94adafede459903db7e2542797cf0eefe2de32900afc83ca1481`。
|
||||||
|
- 服务端 3.954 秒,客户端含轮询 6.072 秒。此短区间已有缓存样本不能代表全市场冷态或多年性能。
|
||||||
|
|
||||||
|
## 发布
|
||||||
|
|
||||||
|
- Engine `d3c36e947894fd220b62ecd6fbfe02473f70bd2c`,tag `v2026.9.11`。
|
||||||
|
- Trading `dfcec36bd1c0f92e73cd30073540eb39dbd02835`,tag `v2026.9.11`。
|
||||||
|
- Backtest service `75202cc3b876daf99d0d2dffb988ca456c34aabf`,重新链接上述引擎。
|
||||||
|
- 只使用官方 installer,以 Boris 构建和运行。发布后 Backtest/Runtime/Paper/Live 的进程和 HTTP `/healthz` 正常,运行二进制核对独立清单,不仅检查源码 HEAD。实时行情 `/readyz` 仍为 503,原因如下,不能宣称自然交易正常。
|
||||||
|
- 原 3 Paper / 1 Live 配置和状态摘要前后相同;本次投影 Paper 为 `52a909117fe8f01ae35a327bd86310e2583d291609bba6596dc0f49a2b10559c`,Live 为 `aaec1e9dbc984012e9fe677e54db1efb860edd59d5840d1dc87c4b230b26bac6`。仅与本次相同投影的发布前数据对比,不与此前其他字段投影混比。
|
||||||
|
- Source PID 2267019、因子主进程 PID 2178403、NRestarts 均不变。本轮未调用 Source/因子重启入口;不能由主 PID 不变推断全部因子子任务已经验收。
|
||||||
|
|
||||||
|
## 未关闭问题
|
||||||
|
|
||||||
|
### 实时行情配额
|
||||||
|
|
||||||
|
发布后文件日志审查发现 THS `-4302`:本周行情用量超过 1.5 亿。受保护的行情源目录只返回 `ths_realtime`,enabled=true、ready=false;没有已配置可用的授权备用源。行情 `/readyz` 返回503、snapshot_count=0,实盘日志反复记录实际执行日2026-09-11请求150证券、收到0新鲜行情,因此 next-open 规划失败。
|
||||||
|
|
||||||
|
所查尾部8,000行日志中,配额告警最早已出现在01:30:12 UTC(上海09:30),早于本轮09:58的Trading发布。不能把该故障归因于本次一元股代码或用重启解决。不得拿昨日收盘、Source历史数据或手工报价代替实时价格;恢复账户配额或配置正式授权的可用行情源后,才能继续自然交易验收。
|
||||||
|
|
||||||
|
Paper的3条WARN为启动重建的PG读取,分别约1.015/1.122/1.460秒;本轮未见ERROR,但这只是采样范围,不能称全部日志无异常。证据:`realtime-quota-timeline.json`、`realtime-provider-readiness.json`、`post-deploy-file-log-audit.json`。Runtime无新采样日志不等于实际调度通过。
|
||||||
|
|
||||||
|
### 执行容量与校准
|
||||||
|
|
||||||
|
独立依赖探针确认:保持 next-open 订单和开盘价不变,仅修改执行日后来形成的全天量,成交量从 100 变为 1,000;仅修改全天 high/low,动态滑点成交价从 10.305 变为 11.000。探针是合成输入,不冒充市场证据。
|
||||||
|
|
||||||
|
详见 `/Users/boris/WorkSpace/docs/fidc/execution-time-capacity-coordination-20260911.md`。下一步须分离实测执行时点容量和声明的容量估计、冻结校准数据时钟、覆盖挂单逐成交腿;不能偷偷改为昨日成交量、关闭限制或使用未来一分钟量。V18 研究只允许新不可变后继评估,不能改现有结果。
|
||||||
|
|
||||||
|
自然 Paper 观察与正式 Live 仍需真实合格版本和正式审批。当前研究控制模型仅 23 个验证日,2026 留出期继续封存;不得为演示闭环降低门槛、伪造 observed、代替审批或手工发证券订单。
|
||||||
|
|
||||||
|
### 并发代码合并
|
||||||
|
|
||||||
|
报告推送时远端新增 `33924b1/f2e228e` 的策略自动交易保护。已保留并合并至main `f7d16fb`,177源码同步,组合引擎回归666通过、8忽略。该合并后的新保护尚未由本任务部署,线上仍使用本报告列出的d3c36e9/dfcec36清单;不能把源码同步当作发布或把对方功能归为本次已完成的自然交易验收。
|
||||||
|
|
||||||
|
随后 Trading main 新增 `4ff7ee9aeefa2e1013098212dc75b4969499a1a6`,本机与177均已正常快进同步,合并组合工作区545通过、10忽略。此为并发功能合并后的源码测试,同样不改变本次发布清单;不重复部署另一个任务尚在验收的完整交易保护功能。
|
||||||
|
|
||||||
|
## 证据
|
||||||
|
|
||||||
|
177 根目录:`/srv/fidc/canonical/run/research/execution-risk-signal-audit-20260911/`。
|
||||||
|
|
||||||
|
- `engine-full-tests-v2.log`、`trading-full-tests.log`、`backtest-full-tests.log`。
|
||||||
|
- `deploy-before.json`、`deploy-after.json`、`running-binary-verification.json`。
|
||||||
|
- `same-signal-backtest/request.json`、`submission.json`、`result.json`、`comparison.json`。
|
||||||
|
- `execution-time-dependency-probe.json` SHA256:`feeb69275b8ad537f16e4c119cc7e59dd3a15773334fb591e27d7afdf34311d3`。
|
||||||
|
- 官方部署日志与独立探针源码保存在相同证据根,不写入交易数据库或修改原始行情。
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# FIDC执行合同与开源框架审查
|
||||||
|
|
||||||
|
状态:源码审查和部分通用修复已完成。尚未完成多策略长区间A/B;不能据此宣称某个框架性能最优或FIDC生产闭环已通过。
|
||||||
|
|
||||||
|
## 固定版本
|
||||||
|
|
||||||
|
源码保存在`/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks`,未执行第三方项目的策略或交易程序。
|
||||||
|
|
||||||
|
| 框架 | 审查版本 | 主要参考位置 |
|
||||||
|
|---|---|---|
|
||||||
|
| NautilusTrader | 6f48cd8e713b72b878626e9a9757c6e4a026b708 | [报价类型](/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks/nautilus_trader/crates/model/src/data/quote.rs:51)、[归并](/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks/nautilus_trader/crates/backtest/src/node.rs:442) |
|
||||||
|
| LEAN | 8ee075a39918f2df6fe9e0a5944e366fb60d10dc | [股票撮合](/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks/Lean/Common/Orders/Fills/EquityFillModel.cs:482) |
|
||||||
|
| Zipline Reloaded | 943010b9da848e317fc520de87edade2b884d329 | [滑点与容量](/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks/zipline-reloaded/src/zipline/finance/slippage.py:464) |
|
||||||
|
| Backtrader | b853d7c90b6721476eb5a5ea3135224e33db1f14 | [Broker](/Volumes/SystemSSD/WorkSpace/fidc-reference-frameworks/backtrader/backtrader/brokers/bbroker.py:228) |
|
||||||
|
|
||||||
|
## 可采用的设计
|
||||||
|
|
||||||
|
### 事件与时钟
|
||||||
|
|
||||||
|
Nautilus把Quote、Trade、Bar区分为不同类型,保存事件与接收/初始化时钟;数据归并按`ts_init`排序,分块保留同一时间戳的完整组。这适合FIDC后续有界分钟流:Source声明观测类型、覆盖区间和可见时间,执行端持有独立账户状态,而非共享一个同时装着日终与盘中字段的可变字典。
|
||||||
|
|
||||||
|
FIDC本轮实际发现:以09:32:58行情给09:33订单定价时,成交时间也写成09:32:58。已修为实际成交不得早于订单执行时钟;价格仍引用原行情,容量扣减也继续绑定原行情,不能通过换一个订单时钟重新获得额度。
|
||||||
|
|
||||||
|
### 开盘和陈旧行情
|
||||||
|
|
||||||
|
LEAN的MarketOnOpenFill单独处理正式开盘成交标志、bar开始/结束时间和订单时间;不是任意取一个日线字段即可成交。但其默认模型也有整体成交和数据回退假设,不能直接当作真实市场流动性保证。
|
||||||
|
|
||||||
|
FIDC已统一预估与撮合的盘中价格选择。己方价、对手价和最近成交价各用自己的字段;缺失/无效时不改用另一种价,也不越过最新坏行情寻找更旧的可用价格。
|
||||||
|
|
||||||
|
### 成交量与滑点
|
||||||
|
|
||||||
|
Zipline按股票和bar累计已使用量,历史冲击窗口排除当前未完成交易日。FIDC应复用不可变历史校准,但每个账户自己的成交消耗必须独立;不能按订单次数重复分配同一个bar的额度。它在历史不足时的回退不是FIDC的默认准入策略。
|
||||||
|
|
||||||
|
FIDC新增`ParticipationRate`:按冻结JSON小数语义精确向下取整,避免浮点乘法和窄整数转换误差。例如58%乘50股为29,不应因二进制误差成为28;巨大市场量也不能在转u32时截断成另一个额度。比例解析在配置阶段完成,不放入逐成交腿热循环。
|
||||||
|
|
||||||
|
Backtrader把volume filler、滑点开关、cheat-on-open/close等模型选择显式区分。值得采用的是明确暴露假设;不照搬不带成交量限制的默认值,也不为了收益对齐开启能改变可见时间的行为。
|
||||||
|
|
||||||
|
## 已落地通用修复
|
||||||
|
|
||||||
|
- 精确参与率计算用于Broker和策略预估,同一观测的已消耗量跨订单共享、跨账户隔离。
|
||||||
|
- 实际执行时钟与参考行情时钟分开,修复成交早于下单的问题。
|
||||||
|
- 缺失的执行价不由其他价格或更旧行情代替;删除重复价格选择及不可达深度分支。
|
||||||
|
- Runner拒绝空身份、错日期、晚于请求时钟的行情、非有限价格、缺失或非整数数量。
|
||||||
|
- 多查询引用同一观测只有完全一致才合并;同一目标查询的源重复行和跨查询冲突均报错,不采用第一条。
|
||||||
|
- 目录缓存使用Linux变更通知,不能只凭mtime/目录大小判断没有新文件;通知不可用时重新扫描。事件溢出、目录替换、重命名、删除均失效重建。
|
||||||
|
|
||||||
|
这些改变不按策略ID、固定选股条件或10:17/10:18等时间分支。
|
||||||
|
|
||||||
|
## 仍未关闭的问题
|
||||||
|
|
||||||
|
1. **日线全天量仍进入早晨数量计算**:Broker和projection两条路径都需接入容量模式。`VolumeCapacityMode`及`SessionCapacityAudit`目前只是已测试基础类型,未完成配置、撮合、日终结果和页面的完整接线。不得称P0已修。
|
||||||
|
2. **Source可能掩盖缺失**:当前目标分钟序列会先剔除无效close,再寻找旧的有效值;部分缺失volume/amount置0;备用Arrow包装器还会用请求时钟替代缺失行情时间。必须清理这些行为,并按数据/市场缺席合同分类。
|
||||||
|
3. **TWAP早期配额可能依赖未来可成交记录数**:当前实现使用筛选后的`eligible_quotes.len()`分配数量。应按冻结时间表切片,后续缺量只能影响后续执行,不改早期分配。
|
||||||
|
4. **集合竞价**:实时数据与日线/分钟模型必须区分委托进入竞价、等待撮合和实际成交,不能用竞价中间的零量判定股票停牌,不能提前使用最终清算价。
|
||||||
|
5. **数据种类/单位**:源观测类型与价格模型能力要明确;分钟OHLC不能冒充真实L1深度。盘口单位、名义bar区间和可见时间仍须逐源校验。
|
||||||
|
|
||||||
|
## 下一阶段实施合同
|
||||||
|
|
||||||
|
- 普通风险开关和参与率仍是同一个策略三端共享配置。历史回测的容量假设单独冻结,不能用研究审核模式绕过Paper/Live临单风控。
|
||||||
|
- 有真实可见观测时使用`execution_observation`;`completed_bar`须验证bar结束和可见时间,不靠日线日期猜15:00。
|
||||||
|
- 只有日线总量而没有开盘容量时,严格模式须在提交预检失败;用户可明确选择`session_capacity_audit`做研究。日终只判定容量验收,不回写早晨的数量、现金、持仓或净值。
|
||||||
|
- 不能自动关闭参与率限制,也不能悄悄替换为昨日量。
|
||||||
|
- Source、Runner、Engine、研究handoff、Strategy AI和UI成套发布;持有冻结合同的旧任务不改写。当前研究维护方尚未授权共享服务切换。
|
||||||
|
|
||||||
|
## 验证与基准
|
||||||
|
|
||||||
|
Engine当前680项通过、8忽略;Runner375项通过,真实Source的8个JSON/Arrow行情点通过严格解析。小样本中的14:59零量在serving Parquet中确实存在,15:00有成交;这是源事实核对,不是完整集合竞价逻辑验收。历史股票收盘竞价时段应按适用规则处理,不能将后来的规则回填到旧日期。[深交所2023年交易机制说明](https://investor.szse.cn/institute/rules/t20230629_601434.html)
|
||||||
|
|
||||||
|
上交所2026版规则于2026-07-06生效,且通知明确存在暂缓实施条文。后续交易时段/容量合同必须同时核对规则版本和实施范围。[上交所发布通知](https://www.sse.com.cn/lawandrules/sselawsrules2025/stocks/exchange/c/c_20260424_10816482.shtml)
|
||||||
|
|
||||||
|
下一组A/B应覆盖动态Top-N日线、静态组合、逐分钟策略、TWAP/VWAP及共享模型信号,分别检查同条件重复、时间变更、参数变更、短区间和五年区间。先关闭时点错误,再测准备/引擎/持久化/端到端耗时、峰值RSS、缓存代际与逐笔差异。不得用微型元数据读取速度外推完整回测性能。
|
||||||
|
|
||||||
|
本轮证据根:`/srv/fidc/canonical/run/research/historical-slippage-20260911/`。服务均未由本任务重启,没有提交回测任务或证券订单。
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# 股票池候选顺序合同
|
||||||
|
|
||||||
|
新请求可显式设置 `runtimeExpressions.selection.preserveCandidateOrder=true`,同一 `candidateSymbolsByDate` 同时冻结成员和顺序。原有未设置该标志的策略保留成员过滤后自行排名的语义,不改写历史回测。
|
||||||
|
|
||||||
|
- 顺序在解析时保留,重复证券仍报错;空日期保持空,不继承旧候选。
|
||||||
|
- 不再走市值快排或套用旧 rank 方向。选股风控和股票条件仍在 Top N 前执行,被排除后从后续已冻结候选补位。
|
||||||
|
- 该标志必须绑定非空的日期映射,不允许空映射放开全市场。
|
||||||
|
- 股票池完成日线筛选的新前端请求采用 next_bar_open,日线信号日与真实执行日分离。
|
||||||
|
|
||||||
|
本轮共享内核全量回归 668 项通过(8 项显式忽略),新增顺序/旧排名方向/选股排除补位验证。该记录不是实盘成交验收,也不代表手选与自动候选混合来源完整实现。
|
||||||
Reference in New Issue
Block a user