remove logs

hlefebvr · Nov 28, 2024 · 97f5832 · 97f5832
1 parent 40d7c88
commit 97f5832
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 45 deletions.
diff --git a/examples/robust/adr-facility-location.data.txt b/examples/robust/adr-facility-location.data.txt
@@ -1,41 +1,41 @@
 10	20
-109.6	131.484
-169.498	103.513
-24.7946	41.8319
-150.331	156.535
-140.651	128.462
-68.8231	66.0825
-5.40097	33.6793
-123.19	113.974
-118.503	152.262
-27.5682	125.587
-36.1992
-5.60365
-10.0339
-20.1965
-17.4686
-35.8237
-14.8866
-2.75196
-36.7471
-2.76135
-12.0892
-16.2641
-11.3815
-8.96618
-32.1548
-13.7501
-0.631599
-26.9407
-36.4762
-10.0098
-0.674345	0.377274	0.60077	0.725902	0.347025	0.648906	0.635155	0.607522	0.333549	0.300607	0.416598	0.628605	0.753687	0.644812	0.405533	0.152511	0.424802	0.261078	0.50283	0.403443
-0.79483	0.0798539	0.347963	0.756363	0.654002	0.484362	0.663717	0.820894	0.220568	0.548021	0.218845	0.779403	0.804299	0.507375	0.592223	0.172742	0.63654	0.0894973	0.819295	0.712606
-0.988408	0.473435	0.741449	1.02582	0.420089	0.859221	0.932609	0.913111	0.206479	0.606641	0.592807	0.943148	1.05883	0.871605	0.719628	0.296455	0.735305	0.405338	0.70923	0.472351
-0.801213	0.930165	1.12413	0.970236	0.281743	1.11036	0.911725	0.579372	0.840547	0.467774	0.937797	0.721997	0.961574	1.08599	0.57822	0.70739	0.533045	0.812734	0.148052	0.238144
-0.033511	0.742563	0.729705	0.21527	0.807152	0.579068	0.209073	0.232984	0.91811	0.384516	0.620859	0.0675881	0.187979	0.528276	0.248045	0.699975	0.263439	0.677736	0.632054	0.831136
-0.379508	0.394834	0.402656	0.338167	0.703938	0.315728	0.243857	0.475284	0.607753	0.336413	0.270847	0.38184	0.381389	0.285442	0.271919	0.405371	0.331478	0.346229	0.681973	0.748633
-1.01954	0.586318	0.852622	1.08059	0.340762	0.955962	0.989606	0.914744	0.331927	0.616543	0.693984	0.966318	1.10785	0.963435	0.742256	0.385068	0.74801	0.505968	0.654321	0.385256
-0.124851	0.647767	0.637432	0.198938	0.766693	0.495492	0.15157	0.278676	0.831333	0.339767	0.525301	0.137635	0.200255	0.446836	0.203461	0.614955	0.238989	0.585824	0.629149	0.796432
-0.822042	0.611747	0.850139	0.920143	0.113758	0.898665	0.836445	0.683577	0.462689	0.406345	0.66767	0.759121	0.93636	0.891583	0.542633	0.376275	0.534339	0.501362	0.400407	0.172095
-0.728693	0.27883	0.523355	0.749647	0.439242	0.602651	0.655937	0.692852	0.235195	0.391798	0.348472	0.692708	0.785082	0.607712	0.47688	0.0436219	0.506139	0.16976	0.61561	0.497567
+174.513	97.8558
+48.8647	104.049
+77.2447	53.1555
+139.44	84.8386
+51.7989	104.833
+101.264	154.236
+122.397	112.704
+12.8724	129.804
+120.495	105.718
+70.859	54.8279
+28.7748
+19.2145
+17.9855
+9.20484
+8.42721
+27.9635
+15.3993
+21.3857
+2.37593
+27.4158
+5.46494
+3.23296
+14.0466
+22.6427
+0.950472
+32.4024
+8.29251
+32.9724
+26.7626
+9.0925
+0.563427	0.678594	0.231061	0.964294	0.504218	0.694586	0.495675	0.405671	0.394821	0.511028	0.17972	0.0631688	0.497052	0.699943	0.157614	0.50223	0.197073	0.777094	0.825301	0.80439
+0.472245	0.181758	0.451114	0.444023	0.173118	0.347351	0.174341	0.365321	0.351831	0.454229	0.545087	0.629375	0.751138	0.432461	0.717837	0.608766	0.530995	0.118222	0.390083	0.46092
+0.218073	0.473697	0.173092	0.572961	0.205162	0.581807	0.223167	0.371983	0.0188247	0.167787	0.364992	0.334506	0.395918	0.63609	0.506896	0.627002	0.362248	0.44577	0.432686	0.713039
+0.494861	0.351709	0.181114	0.747315	0.2352	0.382111	0.211903	0.106172	0.263781	0.445632	0.177518	0.306248	0.620604	0.407891	0.349846	0.349416	0.162647	0.485136	0.635758	0.503902
+0.457874	0.490493	0.657814	0.124942	0.411394	0.657339	0.435126	0.671803	0.499161	0.477219	0.808186	0.835109	0.779815	0.745531	0.975487	0.928048	0.797732	0.228935	0.16426	0.754398
+0.688354	0.139145	0.478003	0.74493	0.329621	0.0782261	0.299363	0.217425	0.487062	0.652105	0.450152	0.609852	0.893962	0.13861	0.601188	0.347714	0.432275	0.398233	0.687758	0.208034
+0.86824	0.502694	0.522402	1.06764	0.571071	0.387768	0.539696	0.295536	0.637114	0.818595	0.357561	0.5433	0.957425	0.327767	0.406187	0.0247001	0.345997	0.744139	0.979198	0.423515
+0.198557	0.80728	0.459023	0.641412	0.536003	0.930177	0.561666	0.718612	0.370138	0.212005	0.64726	0.51815	0.159586	0.987665	0.732485	0.957836	0.65207	0.700386	0.494544	1.06136
+0.349464	0.485499	0.569402	0.168677	0.347086	0.652221	0.375294	0.620241	0.404768	0.369289	0.732193	0.742744	0.671451	0.737534	0.89503	0.885574	0.723279	0.246348	0.0897034	0.761695
+0.499971	0.516812	0.703321	0.11264	0.453948	0.682283	0.476714	0.710529	0.545138	0.520994	0.851832	0.880899	0.821503	0.770979	1.01976	0.963699	0.841115	0.253642	0.19478	0.774225
diff --git a/examples/robust/adr-facility-location.example.cpp b/examples/robust/adr-facility-location.example.cpp
@@ -78,23 +78,20 @@ int main(int t_argc, const char** t_argv) {
      * std::cout << Robust::Description::View(adr_result.model, description) << std::endl;
      */
 
-    const auto adr_result = Robust::AffineDecisionRule::make_model(model, description);
-    std::cout << Robust::Description::View(adr_result.model, description) << std::endl;
-
     model.use(Gurobi());
     model.optimize();
     std::cout << "Deterministic Problem has value: " << model.get_best_obj() << std::endl;
 
     model.use(
             Robust::AffineDecisionRule(description)
-                    .with_deterministic_optimizer(Gurobi())
+                    .with_deterministic_optimizer(Gurobi().with_logs(true))
     );
     model.optimize();
     std::cout << "Affine Decision Rule Problem has value: " << model.get_best_obj() << std::endl;
 
     model.use(
             Robust::Deterministic(description)
-                    .with_deterministic_optimizer(GLPK())
+                    .with_deterministic_optimizer(Gurobi())
     );
     model.optimize();
     std::cout << "Robust Problem has value: " << model.get_best_obj() << std::endl;