mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

sag:: fixed some warnings

Browse Source
This commit is contained in:
Zeno Rogue 2024-07-24 19:29:12 +02:00
parent 0a3653f7fd
commit 04098490d3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rogueviz/sag/annealing.cpp
View File

@ -144,7 +144,7 @@ void dofullsa(ld satime) {
if(t2 - tl > view_each * .98) { if(t2 - tl > view_each * .98) {
tl = t2; tl = t2;
println(hlog, format("it %12Ld temp %6.4f [1/e at %13.6f] cost = %f ", println(hlog, format("it %12lld temp %6.4f [1/e at %13.6f] cost = %f ",
numiter, double(sag::temperature), (double) exp(sag::temperature), numiter, double(sag::temperature), (double) exp(sag::temperature),
double(sag::cost))); double(sag::cost)));
} }
@ -205,7 +205,7 @@ void dofullsa_iterations(long long saiter) {
if(cpct > lpct && output_fullsa) { if(cpct > lpct && output_fullsa) {
lpct = cpct; lpct = cpct;
println(hlog, format("it %12Ld ratio %6.3f temp %8.4f step %9.3g cost %9.2f R=%8.4f T=%8.4f", println(hlog, format("it %12lld ratio %6.3f temp %8.4f step %9.3g cost %9.2f R=%8.4f T=%8.4f",
numiter, last_ratio, double(sag::temperature), (double) exp(sag::temperature), cost, lgsag.R, lgsag.T)); numiter, last_ratio, double(sag::temperature), (double) exp(sag::temperature), cost, lgsag.R, lgsag.T));
} }

4
rogueviz/sag/cells.cpp
View File

@ -79,7 +79,7 @@ struct sagdist_t {
clear(); clear();
fd = open(fname.c_str(), O_RDONLY | O_LARGEFILE); fd = open(fname.c_str(), O_RDONLY | O_LARGEFILE);
if(fd == -1) throw hr_exception("open failed in map"); if(fd == -1) throw hr_exception("open failed in map");
read(fd, &N, 8); if(read(fd, &N, 8) < 8) throw hr_exception("file error");
tabmap = (distance*) mmap(nullptr, N*N*sizeof(distance)+8, PROT_READ, MAP_SHARED, fd, 0); tabmap = (distance*) mmap(nullptr, N*N*sizeof(distance)+8, PROT_READ, MAP_SHARED, fd, 0);
@ -117,7 +117,7 @@ struct sagdist_t {
void save(string fname) { void save(string fname) {
fd = open(fname.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0666); fd = open(fname.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0666);
write(fd, &N, 8); if(write(fd, &N, 8) < 8) throw hr_exception("write error");
size_t size = N*N*sizeof(distance); size_t size = N*N*sizeof(distance);
println(hlog, "size is ", hr::format("%zd", size)); println(hlog, "size is ", hr::format("%zd", size));
char *p = (char*) tab; char *p = (char*) tab;

2
rogueviz/sag/data.cpp
View File

@ -173,7 +173,7 @@ void load_sag_solution(const string& fname) {
void load_sag_solution_basic(const string& fname) { void load_sag_solution_basic(const string& fname) {
if(!(state & SS_DATA)) throw hr_exception("load_sag_solution_basic with no data"); if(!(state & SS_DATA)) throw hr_exception("load_sag_solution_basic with no data");
FILE *f = fopen(fname.c_str(), "rt"); FILE *f = fopen(fname.c_str(), "rt");
for(auto& i: sagid) fscanf(f, "%d", &i); for(auto& i: sagid) if(fscanf(f, "%d", &i) < 1) throw hr_exception("read error in load_sag_solution_basic");
fclose(f); fclose(f);
println(hlog, "loaded sagid = ", sagid); println(hlog, "loaded sagid = ", sagid);

2
rogueviz/sag/sag.cpp
View File

@ -41,7 +41,7 @@ void iterate() {
if(t < (sag_ittime+1) / 2) ipturn *= 2; if(t < (sag_ittime+1) / 2) ipturn *= 2;
else if(t > sag_ittime * 2) ipturn /= 2; else if(t > sag_ittime * 2) ipturn /= 2;
else ipturn = ipturn * sag_ittime / t; else ipturn = ipturn * sag_ittime / t;
print(hlog, format("it %12Ld temp %6.4f [2:%8.6f,10:%8.6f,50:%8.6f] cost = %f\n", print(hlog, format("it %12lld temp %6.4f [2:%8.6f,10:%8.6f,50:%8.6f] cost = %f\n",
numiter, double(sag::temperature), numiter, double(sag::temperature),
(double) exp(-2 * exp(-sag::temperature)), (double) exp(-2 * exp(-sag::temperature)),
(double) exp(-10 * exp(-sag::temperature)), (double) exp(-10 * exp(-sag::temperature)),