mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-30 15:39:54 +00:00
Code Issues Releases Wiki Activity

rogueviz:: sag:: fixed position and move-to

Browse Source
This commit is contained in:
Zeno Rogue 2024-08-21 19:24:04 +02:00
parent a25a476835
commit a45a02d4df
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rogueviz/sag/annealing.cpp
View File

@ -48,6 +48,8 @@ void saiter() {
} }
int t2 = allow_doubles ? -1 : sagnode[sid2]; int t2 = allow_doubles ? -1 : sagnode[sid2];
if(fixed_position[t1] || (t2 >= 0 && fixed_position[t2])) return;
sagnode[sid1] = -1; sagid[t1] = -1; sagnode[sid1] = -1; sagid[t1] = -1;
sagnode[sid2] = -1; if(t2 >= 0) sagid[t2] = -1; sagnode[sid2] = -1; if(t2 >= 0) sagid[t2] = -1;

24
rogueviz/sag/data.cpp
View File

@ -28,6 +28,8 @@ vector<edgeinfo> sagedges;
vector<vector<int>> edges_yes, edges_no; vector<vector<int>> edges_yes, edges_no;
vector<vector<pair<int, double>>> edge_weights; vector<vector<pair<int, double>>> edge_weights;
vector<bool> fixed_position;
ld edgepower=1, edgemul=1; ld edgepower=1, edgemul=1;
void init(); void init();
@ -47,6 +49,8 @@ void prepare_graph() {
edges_yes.clear(); edges_yes.resize(DN); edges_yes.clear(); edges_yes.resize(DN);
edges_no.clear(); edges_no.resize(DN); edges_no.clear(); edges_no.resize(DN);
fixed_position.clear(); fixed_position.resize(DN);
for(int i=0; i<DN; i++) for(int j=0; j<DN; j++) if(i != j) { for(int i=0; i<DN; i++) for(int j=0; j<DN; j++) if(i != j) {
if(alledges.count({i, j})) if(alledges.count({i, j}))
edges_yes[i].push_back(j); edges_yes[i].push_back(j);
@ -386,6 +390,26 @@ int data_read_args() {
PHASE(3); shift(); sag::save_sag_solution(args()); PHASE(3); shift(); sag::save_sag_solution(args());
} }
else if(argis("-sag-fix")) {
shift(); int id = getid(args());
if(id >= isize(sagid)) throw hr_exception("bad id in -sag-fix");
fixed_position[id] = true;
}
else if(argis("-sag-move-to")) {
shift(); int sid1 = getid(args());
if(sid1 < 0 || sid1 >= isize(sagid)) throw hr_exception("bad id in -sag-move-to");
shift(); int t2 = argi();
if(t2 < 0 || t2 >= isize(sagnode)) throw hr_exception("bad id in -sag-move-to");
int sid2 = sagid[t2];
int t1 = allow_doubles ? -1 : sagnode[sid1];
sagnode[sid1] = t2; sagid[t2] = sid1;
if(sid2 >= 0) sagnode[sid2] = t1; sagid[t1] = sid2;
compute_cost();
create_viz();
}
else return 1; else return 1;
#endif #endif
return 0; return 0;