Bind native statistics to recorded careers and correct cup winners (by Codex)
This commit is contained in:
1 parent
e3ea03a05d
commit
eb140cdb1c
24 files changed
+296
-33
No files matched your search
@@ -15,25 +15,26 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files"};
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics"};
|
||||
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
|
||||
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
|
||||
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
|
||||
if (mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
if (mode == "prepare-statistics" || mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
auto package = modern::open_world_package(world);
|
||||
content::Mount mount(world, package.classic); modern::set_current_world(package.world);
|
||||
modern::app::ModernSession session(mount.root(), 17u);
|
||||
ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac"||mode=="prepare-statistics") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::ManagerChoice manager; manager.name = "Codex Engine QA"; manager.master_club = 0;
|
||||
std::string error; ui::CareerInitializationResult result;
|
||||
if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error);
|
||||
if (options.managers == 2) { manager.name = "Codex Opponent QA"; manager.master_club = 1; manager.portrait = 1; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); }
|
||||
if (!session.finish(result, error)) throw std::runtime_error(error);
|
||||
if (mode == "prepare-national" || mode == "prepare-almanac") {
|
||||
if (mode == "prepare-national" || mode == "prepare-almanac" || mode == "prepare-statistics") {
|
||||
uint64_t rev = 0; bool found = false; Json expiry = Json::object(), log = Json::array();
|
||||
for (int k = 0; k < 200; ++k) {
|
||||
const auto desk = Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},rev)));
|
||||
if (mode=="prepare-national" && desk.at("meta").at("scope").at("role") == "national") { found = true; break; }
|
||||
if(mode=="prepare-statistics"&&!session.state().almanac.finished.empty()){found=true;break;}
|
||||
if(mode=="prepare-almanac") {const auto index=Json::parse(cli::dump_json(session.read_almanac(cli::Json::Object{{"kind","index"}})));if(index.value("ok",false)&&index.at("years").size()>=2){found=true;break;}}
|
||||
const auto &meta = desk.at("meta");
|
||||
const Json command{{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:prepare-national-"+std::to_string(k)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};
|
||||
@@ -127,9 +128,25 @@ int main(int argc, char **argv) {
|
||||
const auto &season=session.state().almanac.current;bool found=false;Json recorded=Json::array();for(size_t i=initial;i<season.matches.size();++i){const auto &match=season.matches[i];for(int manager:{int(match.home_manager),int(match.away_manager)})if(manager>=0){const auto &person=season.managers.at(size_t(manager));recorded.push_back({{"managerIndex",person.index},{"name",person.name},{"matchType",match.type}});if(match.type==7||match.type==8){if(person.index!=2||person.name!="Alex Berger")throw std::runtime_error("national archive used another human");found=true;}}}
|
||||
if(!found)throw std::runtime_error("no human national match recorded");write("recorded-managers.json",recorded);write("returned.json",Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","session"}},revision))));std::string error;const int active=session.state().memory.u8(::bmh::layout::ActiveManager);if(!session.save_game(out/"after-national.obs",active,false,error))throw std::runtime_error(error);modern::set_current_world(nullptr);std::cout<<"national archive attributed to third human\n";return 0;
|
||||
}
|
||||
if(mode=="inspect-statistics") {
|
||||
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);
|
||||
write("winner-records.json",Json::parse(cli::dump_json(session.read_statistics(cli::Json::Object{{"kind","winners"}}))));modern::set_current_world(nullptr);return 0;
|
||||
}
|
||||
auto link = EngineBridge::open(world, out / "input.obs");
|
||||
const auto before = link->snapshot(); write("before.json", before);
|
||||
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
|
||||
if(mode=="verify-statistics") {
|
||||
Json all=Json::array();
|
||||
const auto run=[&](const Json &query){const auto read=link->read({{"kind","statistics"},{"query",query}});auto value=engine_statistics_projection(before,read);if(link->read({{"kind","statistics"},{"query",query}})!=read)throw std::runtime_error("statistics read not repeatable");all.push_back({{"query",query},{"read",read},{"projection",value}});return value;};
|
||||
for(int section=0;section<9;++section)run({{"section",section}});
|
||||
for(int country=0;country<6;++country){run({{"section",3},{"country",country}});run({{"section",4},{"country",country}});}
|
||||
for(int category:{0,1,5})run({{"section",7},{"category",category}});
|
||||
const auto index=run({{"section",7}});for(const auto &country:index.at("countries"))run({{"section",7},{"winner_country",country.at("id")}});
|
||||
run({{"section",2},{"absolute",true},{"curves",{false,true,false,true,false,true}}});
|
||||
if(link->snapshot()!=before)throw std::runtime_error("statistics reads changed session");
|
||||
for(const auto &query:Json::array({Json{{"section",9}},Json{{"unknown",true}},Json{{"section",7},{"winner_country","nation:missing"}}})){const auto result=link->read({{"kind","statistics"},{"query",query}});if(result.value("messageType","")!="error"||link->snapshot()!=before)throw std::runtime_error("invalid statistics filter not rejected purely");}
|
||||
write("all-statistics.json",all);write("saved.json",link->save_copy(out/"unchanged.obs"));write("receipt.json",{{"status","passed"},{"reads",int(all.size())},{"invalidFilters",3},{"readOnly",true}});std::cout<<"real statistics filters, series and read purity passed\n";return 0;
|
||||
}
|
||||
if(mode=="verify-files") {
|
||||
auto store=make_career_files(out/"library",world);const auto meta=link->file_metadata();write("metadata.json",meta);
|
||||
const auto first=store.put("Erste Saison",[&](const auto &path){link->save_copy(path);});
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <cmath>
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void require(bool yes,const char *why){if(!yes)throw std::runtime_error(why);}
|
||||
template<class F>void rejects(F f){bool rejected=false;try{f();}catch(const std::exception&){rejected=true;}require(rejected,"invalid statistics accepted");}
|
||||
Json bundle(){const Json meta={{"contractVersion","bmh-modern-ui@draft1"},{"careerId","career:test"},{"worldId","world:test"},{"worldRevision","1"},{"stateRevision","3"},{"scope",{{"managerId","manager:test"},{"teamId","club:test"}}}};Json b;for(const auto *kind:{"session","desktop","camps"})b[kind]={{"messageType","snapshot"},{"meta",meta},{"data",{{"kind",kind}}}};b["desktop"]["data"].update({{"manager",{{"id","manager:test"}}},{"team",{{"id","club:test"}}},{"accounts",{{"cash",{{"currency","EUR"},{"minorUnits",2},{"minor","0"}}}}}});b["camps"]["data"]["camps"]=Json::array();return b;}
|
||||
Json report(){return {{"ok",true},{"fictional",false},{"section",2},{"available",true},{"absolute",false},{"columns",Json::array()},{"rows",Json::array()},{"series",{{{"name","Rank"},{"active",true},{"values",{1,3,2}},{"absoluteMin",1},{"absoluteMax",18}},{{"name","Cash"},{"active",false},{"values",{-100,0,100}},{"absoluteMin",-200},{"absoluteMax",200}}}}};}
|
||||
Json read(const Json &b,const Json &report){return {{"messageType","snapshot"},{"meta",b.at("desktop").at("meta")},{"data",{{"kind","statistics"},{"query",Json::object()},{"report",report}}}};}
|
||||
}
|
||||
int main(){try{
|
||||
const auto b=bundle();auto raw=report();const auto original=raw;const auto v=engine_statistics_projection(b,read(b,raw));require(raw==original,"projection changed engine report");require(v.at("series")[0].at("values")==raw.at("series")[0].at("values"),"source values changed");require(v.at("series")[0].at("points")[0][1]==50.&&v.at("series")[0].at("points")[1][1]==730.,"rank direction reversed");require(v.at("series")[1].at("points")[0][1]==730.&&v.at("series")[1].at("points")[2][1]==50.,"value direction reversed");require(v.at("series")[1].at("active")==false,"hidden curve reactivated");
|
||||
raw["absolute"]=true;const auto a=engine_statistics_projection(b,read(b,raw));require(std::abs(a.at("series")[1].at("points")[0][1].get<double>()-560.)<.001,"absolute range ignored");
|
||||
raw["series"][0]["values"]={0};raw["absolute"]=false;const auto constant=engine_statistics_projection(b,read(b,raw));require(constant.at("series")[0].at("points")[0][1]==390.,"constant series is not centered");
|
||||
auto stale=read(b,raw);stale["meta"]["scope"]["managerId"]="manager:other";rejects([&]{engine_statistics_projection(b,stale);});raw["fictional"]=true;rejects([&]{engine_statistics_projection(b,read(b,raw));});raw=report();raw["series"][0]["values"][0]="3";rejects([&]{engine_statistics_projection(b,read(b,raw));});
|
||||
raw=report();raw["section"]=7;raw["series"]=Json::array();raw["columns"]={{{"text","Season"}},{{"text","Cup"},{"trophy","dfb-cup"}}};raw["rows"]={{{"cells",{{{"text","2030/31"}},{{"text","Synthetic winner"},{"club","club:winner"}}}}}};const auto winners=engine_statistics_projection(b,read(b,raw));require(winners.at("columns")[1].at("winner")=="club:winner"&&winners.at("columns")[1].at("season")=="2030/31","trophy lost recorded winner/season");raw["rows"]=Json::array();raw["available"]=false;raw["reason"]="not_recorded";const auto empty=engine_statistics_projection(b,read(b,raw));require(!empty.at("available").get<bool>()&&empty.at("rows").empty()&&!empty.at("columns")[1].contains("winner"),"empty archive invented winner");
|
||||
std::cout<<"statistics: authoritative rows, signed values, scales, missing records and context checks passed\n";return 0;
|
||||
}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}}
|
||||
@@ -0,0 +1,32 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/content/statistics.hpp"
|
||||
#include "modern/game/modern_state.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh::modern;
|
||||
namespace {
|
||||
using J=bmh::cli::Json;using O=J::Object;
|
||||
const J& at(const J& v,const char *key){return v.object()->at(key);}
|
||||
void check(bool value,const char *why){if(!value)throw std::runtime_error(why);}
|
||||
std::string club(const J& view,size_t column){return *at(at(at(view,"rows").array()->at(0),"cells").array()->at(column),"club").string();}
|
||||
}
|
||||
int main()try{
|
||||
ModernState g;g.manager_teams={0};g.manager_records.resize(0xb0c);g.display_start_year=2026;auto &s=g.almanac.current;s.season=0;s.start_year=2026;
|
||||
for(int i=0;i<8;++i)s.club({"club:"+std::to_string(i),"Synthetic club "+std::to_string(i)});
|
||||
// Real cup-table indices: 1 UEFA, 2 Champions League, 3 Cup Winners, 8 Supercup.
|
||||
for(int cup:{1,2,3,8})s.winners.push_back({uint8_t(cup+1),0xff,0xff,0,100,uint16_t(cup==8?4:cup),0xffff});
|
||||
s.winners.push_back({0,0,0xff,0,100,5,0xffff});s.winners.push_back({1,0xff,0xff,0,100,6,0xffff});s.winners.push_back({0,6,0xff,0,100,7,0xffff});
|
||||
const auto previous=s;
|
||||
const auto europe=query_statistics_screen(g,0,O{{"section",7},{"category",1}});
|
||||
check(at(europe,"ok").boolean()&&*at(europe,"ok").boolean(),"European read unavailable");
|
||||
check(club(europe,1)=="club:2","Champions League column names another cup's winner");
|
||||
check(club(europe,2)=="club:3","Cup Winners column names another cup's winner");
|
||||
check(club(europe,3)=="club:1","UEFA column names another cup's winner");
|
||||
const auto de=query_statistics_screen(g,0,O{{"section",7},{"category",0}});
|
||||
check(at(de,"columns").array()->size()==4,"German Supercup column missing");
|
||||
check(club(de,1)=="club:5"&&club(de,2)=="club:6"&&club(de,3)=="club:4","German winners do not use their recorded competitions");
|
||||
const auto en=query_statistics_screen(g,0,O{{"section",7},{"category",0},{"winner_country","nation:en"}});
|
||||
check(club(en,1)=="club:7","foreign championship winner differs");
|
||||
check(*at(at(en,"columns").array()->at(1),"trophy").string()=="en-premier-league","foreign championship has wrong trophy role");
|
||||
check(g.almanac.current==previous,"winner queries modified archive");std::cout<<"winners: distinct European cups, Supercup and foreign trophy roles passed\n";return 0;
|
||||
}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}
|
||||
Reference in new issue
Block a user