Skip to content

S
sparrowzz
Commit 5f5e8e77 by dongshufeng
Options

refactor(all): change structure

parent 60f3a2d5
正在显示 包含 119 行增加 和 87 行删除
Cargo.lock
......@@ -28,9 +28,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.86"
version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
[[package]]
name = "approx"
......@@ -51,6 +51,15 @@ dependencies = [
]
[[package]]
name = "arrow-schema"
version = "53.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85320a3a2facf2b2822b57aa9d6d9d55edb8aee0b6b5d3b8df158e503d10858"
dependencies = [
"serde",
]
[[package]]
name = "async-channel"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
......@@ -88,9 +97,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
version = "1.16.3"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
[[package]]
name = "byteorder"
......@@ -106,9 +115,12 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "cc"
version = "1.1.7"
version = "1.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
dependencies = [
"shlex",
]
[[package]]
name = "cfg-if"
......@@ -190,9 +202,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
version = "0.8.6"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cron"
......@@ -261,7 +273,7 @@ dependencies = [
name = "ds-3phase-pf"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"ciborium",
"csv",
......@@ -290,7 +302,7 @@ dependencies = [
name = "ds-dev-ohm-cal"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"ciborium",
"csv",
......@@ -306,7 +318,7 @@ dependencies = [
name = "ds-dyn-topo"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"ciborium",
"csv",
......@@ -320,7 +332,7 @@ dependencies = [
name = "ds-guizhou"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"chrono",
"chrono-tz",
......@@ -334,7 +346,7 @@ dependencies = [
name = "ds-static-topo"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"ciborium",
"log",
......@@ -346,7 +358,7 @@ dependencies = [
name = "ds-tn-input"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 52.2.0",
"bytes",
"ciborium",
"csv",
......@@ -384,7 +396,7 @@ name = "eig-expr"
version = "0.1.0"
dependencies = [
"fnv",
"ndarray 0.16.0",
"ndarray 0.16.1",
"nom",
"num-complex",
"num-traits",
......@@ -412,7 +424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys",
"windows-sys 0.52.0",
]
[[package]]
......@@ -438,9 +450,9 @@ dependencies = [
[[package]]
name = "fastrand"
version = "2.1.0"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fixedbitset"
......@@ -482,7 +494,7 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
"windows-sys",
"windows-sys 0.52.0",
]
[[package]]
......@@ -510,9 +522,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.3.0"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
"hashbrown",
......@@ -526,18 +538,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "js-sys"
version = "0.3.69"
version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "libc"
version = "0.2.155"
version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "linux-raw-sys"
......@@ -571,7 +583,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
name = "mems"
version = "0.1.0"
dependencies = [
"arrow-schema",
"arrow-schema 53.0.0",
"async-channel",
"base64",
"byteorder",
......@@ -639,9 +651,9 @@ dependencies = [
[[package]]
name = "ndarray"
version = "0.16.0"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "087ee1ca8a7c22830c2bba4a96ed8e72ce0968ae944349324d52522f66aa3944"
checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841"
dependencies = [
"matrixmultiply",
"num-complex",
......@@ -718,9 +730,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "parking"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parse-zoneinfo"
......@@ -817,9 +829,9 @@ dependencies = [
[[package]]
name = "protobuf"
version = "3.5.0"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514"
checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6"
dependencies = [
"bytes",
"once_cell",
......@@ -829,9 +841,9 @@ dependencies = [
[[package]]
name = "protobuf-codegen"
version = "3.5.0"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc"
checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189"
dependencies = [
"anyhow",
"once_cell",
......@@ -844,9 +856,9 @@ dependencies = [
[[package]]
name = "protobuf-parse"
version = "3.5.0"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f"
checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76"
dependencies = [
"anyhow",
"indexmap",
......@@ -860,18 +872,18 @@ dependencies = [
[[package]]
name = "protobuf-support"
version = "3.5.0"
version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3"
checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9"
dependencies = [
"thiserror",
]
[[package]]
name = "quote"
version = "1.0.36"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
......@@ -954,15 +966,15 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustix"
version = "0.38.34"
version = "0.38.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys",
"windows-sys",
"windows-sys 0.52.0",
]
[[package]]
......@@ -982,18 +994,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.204"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.204"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
......@@ -1002,9 +1014,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.122"
version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
"memchr",
......@@ -1013,6 +1025,12 @@ dependencies = [
]
[[package]]
name = "shlex"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "simba"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
......@@ -1033,9 +1051,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "syn"
version = "2.0.72"
version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
......@@ -1044,15 +1062,15 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.11.0"
version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
dependencies = [
"cfg-if",
"fastrand",
"once_cell",
"rustix",
"windows-sys",
"windows-sys 0.59.0",
]
[[package]]
......@@ -1089,19 +1107,20 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "wasm-bindgen"
version = "0.2.92"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
"once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.92"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
......@@ -1114,9 +1133,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.92"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
......@@ -1124,9 +1143,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.92"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
......@@ -1137,9 +1156,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.92"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "which"
......@@ -1155,9 +1174,9 @@ dependencies = [
[[package]]
name = "wide"
version = "0.7.26"
version = "0.7.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692"
checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690"
dependencies = [
"bytemuck",
"safe_arch",
......@@ -1182,6 +1201,15 @@ dependencies = [
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
......
Cargo.toml
......@@ -5,13 +5,13 @@ members = [
"eig-domain",
"eig-aoe",
"mems",
"mems/examples/ds-common",
"mems/examples/ds-static-topo",
"mems/examples/ds-dev-ohm-cal",
"mems/examples/ds-dyn-topo",
"mems/examples/ds-pf-input",
"mems/examples/ds-3phase-pf",
"mems/examples/ds-guizhou",
"mems/examples/ds-powerflow/ds-common",
"mems/examples/ds-powerflow/ds-static-topo",
"mems/examples/ds-powerflow/ds-dev-ohm-cal",
"mems/examples/ds-powerflow/ds-dyn-topo",
"mems/examples/ds-powerflow/ds-pf-input",
"mems/examples/ds-powerflow/ds-3phase-pf",
"mems/examples/ds-powerflow/ds-guizhou",
]
[workspace.package]
......
mems/Cargo.toml
......@@ -20,7 +20,7 @@ num-traits = "0.2"
cron = "0.12"
async-channel = "2.3"
base64 = "0.22"
arrow-schema = { version = "52.1", features = ["serde"] }
arrow-schema = { version = "53.0", features = ["serde"] }
# this project
eig-domain = { path = "../eig-domain" }
......
mems/examples/ds-3phase-pf/Cargo.toml → mems/examples/ds-powerflow/ds-3phase-pf/Cargo.toml
......@@ -17,6 +17,6 @@ ndarray = "0.15"
nalgebra = "0.33"
ds-common = { path = "../ds-common" }
eig-domain = { path = "../../../eig-domain" }
mems = { path = "../../../mems" }
eig-domain = { path = "../../../../eig-domain" }
mems = { path = "../../.." }
bytes = "1.6.1"
\ No newline at end of file
mems/examples/ds-common/Cargo.toml → mems/examples/ds-powerflow/ds-common/Cargo.toml
......@@ -7,5 +7,5 @@ edition = "2021"
log = "0.4"
serde_json = "1.0"
csv = "1.3.0"
eig-domain = { path = "../../../eig-domain" }
mems = { path = "../../../mems" }
\ No newline at end of file
eig-domain = { path = "../../../../eig-domain" }
mems = { path = "../../.." }
\ No newline at end of file
mems/examples/ds-dev-ohm-cal/Cargo.toml → mems/examples/ds-powerflow/ds-dev-ohm-cal/Cargo.toml
......@@ -12,8 +12,8 @@ serde_json = "1.0"
ciborium = "0.2"
arrow-schema = { version = "52.1", features = ["serde"] }
petgraph = "0.6"
eig-domain = { path = "../../../eig-domain" }
mems = { path = "../../../mems" }
eig-domain = { path = "../../../../eig-domain" }
mems = { path = "../../.." }
csv = "1.3.0"
ndarray = "0.15"
bytes = "1.6.1"
mems/examples/ds-dyn-topo/Cargo.toml → mems/examples/ds-powerflow/ds-dyn-topo/Cargo.toml
......@@ -11,7 +11,7 @@ log = "0.4"
csv = "1.3.0"
ciborium = "0.2"
arrow-schema = { version = "52.1", features = ["serde"] }
eig-domain = { path = "../../../eig-domain" }
mems = { path = "../../../mems" }
eig-domain = { path = "../../../../eig-domain" }
mems = { path = "../../.." }
ds-common = { path = "../ds-common" }
bytes = "1.6.1"
\ No newline at end of file
mems/examples/ds-guizhou/Cargo.toml → mems/examples/ds-powerflow/ds-guizhou/Cargo.toml
......@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
log = "0.4"
ciborium = "0.2"
arrow-schema = { version = "52.1", features = ["serde"] }
mems = { path = "../../../mems" }
mems = { path = "../../.." }
csv = "1.3.0"
bytes = "1.6.1"
chrono = "0.4.38"
......
mems/examples/ds-pf-input/Cargo.toml → mems/examples/ds-powerflow/ds-pf-input/Cargo.toml
......@@ -12,6 +12,6 @@ csv = "1.3.0"
ciborium = "0.2"
arrow-schema = { version = "52.1", features = ["serde"] }
ds-common = { path = "../ds-common" }
eig-domain = { path = "../../../eig-domain" }
mems = { path = "../../../mems" }
eig-domain = { path = "../../../../eig-domain" }
mems = { path = "../../.." }
bytes = "1.6.1"
\ No newline at end of file
mems/examples/ds-static-topo/Cargo.toml → mems/examples/ds-powerflow/ds-static-topo/Cargo.toml
......@@ -11,5 +11,5 @@ log = "0.4"
ciborium = "0.2"
arrow-schema = { version = "52.1", features = ["serde"] }
petgraph = "0.6"
mems = { path = "../../../mems" }
mems = { path = "../../.." }
bytes = "1.6.1"
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论