From 06ac14d33d10aa5f15d1ac7793f2ec631236f4b4 Mon Sep 17 00:00:00 2001 From: shenjack-5600u <3695888@qq.com> Date: Thu, 25 Apr 2024 22:40:46 +0800 Subject: [PATCH] 0.1.1 tswn! --- Cargo.lock | 2 +- miner/Cargo.toml | 2 +- miner/src/evaluate/xuping/eval.rs | 3 +++ readme.md | 32 ++++++++++++++++++------------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76628f9..1f1cf76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1831,7 +1831,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tswn" -version = "0.1.0" +version = "0.1.1" dependencies = [ "base16384", "chrono", diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 2adcb4e..eaebb84 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tswn" description = "tool shenjack work shop namerena" -version = "0.1.0" +version = "0.1.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/miner/src/evaluate/xuping/eval.rs b/miner/src/evaluate/xuping/eval.rs index 6d34d2b..f45d5e7 100644 --- a/miner/src/evaluate/xuping/eval.rs +++ b/miner/src/evaluate/xuping/eval.rs @@ -207,6 +207,9 @@ pub fn predict_20(name: &Namer) -> f64 { for i in 0..1034 { sum += xp[i] * xuping20::MODEL[i]; + // unsafe { + // sum += xp.get_unchecked(i) * xuping20::MODEL.get_unchecked(i); + // } } // for i in 0..1034 { // sum_qd += xp[i] * xuping20::MODEL_QD[i]; diff --git a/readme.md b/readme.md index bc5ceae..2c43d8c 100644 --- a/readme.md +++ b/readme.md @@ -5,28 +5,34 @@ ## 用法 ```text -Usage: namerena-rs.exe [OPTIONS] --team +Usage: tswn.exe [OPTIONS] --team Options: --start 开始的 id [default: 0] --end 结束的 id [default: 18446744073709551615] -t, --thread-count 线程数 [default: 10] - -p, --prop-expected 八围预期值 [default: 740] + -p, --prop-expected 八围预期值 [default: 640] + -q, --qp-expected qp 预期值 [default: 0] --team 队伍名称 -r, --report-interval 预期状态输出时间间隔 (秒) [default: 10] -h, --help Print help ``` ```text -2024-03-01T18:37:10.173136Z INFO namerena_rs: | 5|Id: 3739645623|469537.07/s 405.680E/d 9.82⬆️|6 |预计:1091308155:41:31| -2024-03-01T18:37:10.194772Z INFO namerena_rs: | 2|Id: 3734123020|473225.72/s 408.867E/d 9.74⬆️|4 |预计:1082803227:51:0| -2024-03-01T18:37:10.231521Z INFO namerena_rs: | 8|Id: 3729376726|469175.03/s 405.367E/d 9.72⬆️|6 |预计:1092150173:10:30| -2024-03-01T18:37:10.251452Z INFO namerena_rs: | 9|Id: 3732033027|472235.53/s 408.012E/d 9.75⬆️|9 |预计:1085073231:32:47| -2024-03-01T18:37:10.340098Z INFO namerena_rs: | 3|Id: 3725914021|468009.19/s 404.360E/d 9.70⬆️|4 |预计:1094871161:39:53| -2024-03-01T18:37:20.400566Z INFO namerena_rs: | 1|Id: 3795115419|451859.64/s 390.407E/d 10.40⬇️|6 |预计:1134003212:16:47| -2024-03-01T18:37:20.486611Z INFO namerena_rs: |10|Id: 3793752828|449366.88/s 388.253E/d 10.46⬇️|5 |预计:1140294453:44:10| -2024-03-01T18:37:20.496393Z INFO namerena_rs: | 6|Id: 3798215724|452784.92/s 391.206E/d 10.53⬇️|7 |预计:1131686538:10:2| -2024-03-01T18:37:20.541673Z INFO namerena_rs: | 7|Id: 3796865625|450432.78/s 389.174E/d 10.44⬇️|8 |预计:1137595813:34:8| -2024-03-01T18:37:20.587515Z INFO namerena_rs: | 5|Id: 3786599323|450863.35/s 389.546E/d 10.41⬇️|6 |预计:1136508335:7:17| -2024-03-01T18:37:20.606505Z INFO namerena_rs: | 4|Id: 3791895222|448066.32/s 387.129E/d 10.57⬇️|7 |预计:1143602856:29:37| +2024-04-25T14:38:37.928073Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-25_22-38-37.txt" +2024-04-25T14:38:37.928448Z INFO tswn: 开始: 0 结尾: 100000000 +2024-04-25T14:38:37.928527Z INFO tswn: 线程数: 1 +2024-04-25T14:38:37.928582Z INFO tswn: 八围预期: 640 +2024-04-25T14:38:37.928633Z INFO tswn: 队伍名: shenjacks +2024-04-25T14:38:37.928689Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-25_22-38-37.txt" +2024-04-25T14:38:37.928773Z INFO tswn: 开始计算 +2024-04-25T14:38:37.928857Z INFO tswn: 线程 thread_0 开始计算 +2024-04-25T14:38:37.947371Z INFO tswn::cacluate: | 1|Id: 10000|542408.18/s 468.641E/d 0.02⬆️|0 |预计:0:3:4| +2024-04-25T14:38:48.111355Z INFO tswn::cacluate: | 1|Id: 5434080|533663.84/s 461.086E/d 10.16⬇️|0 |预计:0:2:57| +2024-04-25T14:38:58.566294Z INFO tswn::cacluate: | 1|Id: 10770710|510448.33/s 441.027E/d 10.45⬇️|0 |预计:0:2:54| +2024-04-25T14:39:08.419676Z INFO tswn::cacluate: | 1|Id: 15875190|518062.38/s 447.606E/d 9.85⬆️|0 |预计:0:2:42| +2024-04-25T14:39:18.371574Z INFO tswn::cacluate: | 1|Id: 21055810|520575.43/s 449.777E/d 9.95⬆️|0 |预计:0:2:31| +2024-04-25T14:39:28.277127Z INFO tswn::cacluate: | 1|Id: 26261560|525550.00/s 454.075E/d 9.91⬆️|0 |预计:0:2:20| +2024-04-25T14:39:38.073338Z INFO tswn::cacluate: | 1|Id: 31517060|536495.12/s 463.532E/d 9.80⬆️|0 |预计:0:2:7| +2024-04-25T14:39:48.224642Z INFO tswn::cacluate: | 1|Id: 36882010|528507.78/s 456.631E/d 10.15⬇️|0 |预计:0:1:59| ```