shenjack/namerena-rs
shenjack/namerena-rs
0
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

大概是0.1.6完全体

Browse Source
This commit is contained in:
shenjack 2024-04-26 22:20:13 +08:00
parent cf824eb82d
commit 50940e5004
Signed by: shenjack
GPG Key ID: 7B1134A979775551
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
miner/src/cacluate.rs
View File

@ -57,7 +57,7 @@ pub struct CacluateConfig {
#[inline(always)] #[inline(always)]
pub fn cacl(config: CacluateConfig, id: u64, outfile: &PathBuf) { pub fn cacl(config: CacluateConfig, id: u64, outfile: &PathBuf) {
// 初始猜测的时间间隔 // 初始猜测的时间间隔
let mut report_interval = 10000; // 第一次猜测测 1w 次, 获取初始数据 let mut report_interval = 100000; // 第一次猜测测 10w 次, 获取初始数据
let mut run_speed = 0.0; let mut run_speed = 0.0;
let mut start_time = std::time::Instant::now(); let mut start_time = std::time::Instant::now();
let mut k: u64 = 0; let mut k: u64 = 0;
@ -115,12 +115,14 @@ pub fn cacl(config: CacluateConfig, id: u64, outfile: &PathBuf) {
// 虚评 // 虚评
namer.update_skill(); namer.update_skill();
// let xu = crate::evaluate::xuping::XuPing1_3_1::evaluate(&namer);
let xu = crate::evaluate::xuping::XuPing2_0_1015::evaluate(&namer); let xu = crate::evaluate::xuping::XuPing2_0_1015::evaluate(&namer);
if xu < config.qp_expect as f64 { if xu < config.qp_expect as f64 {
continue; continue;
} }
let xu_qd = crate::evaluate::xuping::XuPing2_0_1015_QD::evaluate(&namer);
// debug!("Id:{:>15}|{:>5}|{}|{}", i, full_name, xu, show_name(&namer)); // debug!("Id:{:>15}|{:>5}|{}|{}", i, full_name, xu, show_name(&namer));
// let skill_sum: u32 = { // let skill_sum: u32 = {
@ -142,12 +144,22 @@ pub fn cacl(config: CacluateConfig, id: u64, outfile: &PathBuf) {
get_count += 1; get_count += 1;
info!("Id:{:>15}|{}|{}|{}", i, full_name, xu, namer.get_info()); info!("Id:{:>15}|{}|{}|{}", i, full_name, xu, namer.get_info());
let write_in = format!(
// <full_name>,<xu>,<xuqd>,<namer.get_info()>
"{},{},{},{}\n",
full_name,
xu,
xu_qd,
namer.get_info()
);
// 写入 (写到最后一行) // 写入 (写到最后一行)
match std::fs::OpenOptions::new() match std::fs::OpenOptions::new()
.append(true) .append(true)
.create(true) .create(true)
.open(outfile) .open(outfile)
.and_then(|mut file| file.write(format!("{}\n", full_name).as_bytes())) .and_then(|mut file| file.write(write_in.as_bytes()))
{ {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {

6
wgpu-mine/Cargo.toml
View File

@ -7,9 +7,9 @@ edition = "2021"
bytemuck = "1.15.0" bytemuck = "1.15.0"
flume = "0.11.0" flume = "0.11.0"
pollster = "0.3.0" pollster = "0.3.0"
serde = { version = "1.0.197", features = ["serde_derive"] } serde = { version = "1.0", features = ["serde_derive"] }
serde_json = "1.0.115" serde_json = "1.0"
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"
wgpu = "0.19.3" wgpu = "0.19.4"