casadi 3.6.7__cp37-none-win_amd64.whl → 3.7.0__cp37-none-win_amd64.whl

casadi/include/highs/simplex/SimplexTimer.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -123,116 +120,101 @@ class SimplexTimer {
     HighsTimer* timer_pointer = simplex_timer_clock.timer_pointer_;
     std::vector<HighsInt>& clock = simplex_timer_clock.clock_;
     clock.resize(SimplexNumClock);
-    clock[SimplexTotalClock] = timer_pointer->clock_def("Simplex total", "STT");
-    clock[SimplexIzDseWtClock] = timer_pointer->clock_def("Iz DSE Wt", "IWT");
-    clock[SimplexDualPhase1Clock] =
-        timer_pointer->clock_def("Dual Phase 1", "DP1");
-    clock[SimplexDualPhase2Clock] =
-        timer_pointer->clock_def("Dual Phase 2", "DP2");
+    clock[SimplexTotalClock] = timer_pointer->clock_def("Simplex total");
+    clock[SimplexIzDseWtClock] = timer_pointer->clock_def("Iz DSE Wt");
+    clock[SimplexDualPhase1Clock] = timer_pointer->clock_def("Dual Phase 1");
+    clock[SimplexDualPhase2Clock] = timer_pointer->clock_def("Dual Phase 2");
     clock[SimplexPrimalPhase1Clock] =
-        timer_pointer->clock_def("Primal Phase 1", "PP1");
+        timer_pointer->clock_def("Primal Phase 1");
     clock[SimplexPrimalPhase2Clock] =
-        timer_pointer->clock_def("Primal Phase 2", "PP2");
-    clock[Group1Clock] = timer_pointer->clock_def("GROUP1", "GP1");
-    clock[IterateClock] = timer_pointer->clock_def("ITERATE", "ITR");
-    clock[IterateDualRebuildClock] =
-        timer_pointer->clock_def("DUAL REBUILD", "DRB");
+        timer_pointer->clock_def("Primal Phase 2");
+    clock[Group1Clock] = timer_pointer->clock_def("GROUP1");
+    clock[IterateClock] = timer_pointer->clock_def("ITERATE");
+    clock[IterateDualRebuildClock] = timer_pointer->clock_def("DUAL REBUILD");
     clock[IteratePrimalRebuildClock] =
-        timer_pointer->clock_def("PRIMAL REBUILD", "PRB");
-    clock[IterateChuzrClock] = timer_pointer->clock_def("CHUZR", "CZR");
-    clock[IterateChuzcClock] = timer_pointer->clock_def("CHUZC", "CZC");
-    clock[IterateFtranClock] = timer_pointer->clock_def("FTRAN", "FTR");
-    clock[IterateVerifyClock] = timer_pointer->clock_def("VERIFY", "VRF");
-    clock[IterateDualClock] = timer_pointer->clock_def("DUAL", "UDU");
-    clock[IteratePrimalClock] = timer_pointer->clock_def("PRIMAL", "UPR");
-    clock[IterateDevexIzClock] = timer_pointer->clock_def("DEVEX_IZ", "DVI");
-    clock[IteratePivotsClock] = timer_pointer->clock_def("PIVOTS", "PIV");
+        timer_pointer->clock_def("PRIMAL REBUILD");
+    clock[IterateChuzrClock] = timer_pointer->clock_def("CHUZR");
+    clock[IterateChuzcClock] = timer_pointer->clock_def("CHUZC");
+    clock[IterateFtranClock] = timer_pointer->clock_def("FTRAN");
+    clock[IterateVerifyClock] = timer_pointer->clock_def("VERIFY");
+    clock[IterateDualClock] = timer_pointer->clock_def("DUAL");
+    clock[IteratePrimalClock] = timer_pointer->clock_def("PRIMAL");
+    clock[IterateDevexIzClock] = timer_pointer->clock_def("DEVEX_IZ");
+    clock[IteratePivotsClock] = timer_pointer->clock_def("PIVOTS");
     clock[initialiseSimplexLpBasisAndFactorClock] =
-        timer_pointer->clock_def("IZ_SIMPLEX_LP_DEF", "ISD");
+        timer_pointer->clock_def("IZ_SIMPLEX_LP_DEF");
     clock[allocateSimplexArraysClock] =
-        timer_pointer->clock_def("ALLOC_SIMPLEX_ARRS", "ASA");
+        timer_pointer->clock_def("ALLOC_SIMPLEX_ARRS");
     clock[initialiseSimplexCostBoundsClock] =
-        timer_pointer->clock_def("IZ_SIMPLEX_CO_BD", "ICB");
-    clock[ScaleClock] = timer_pointer->clock_def("SCALE", "SCL");
-    clock[CrashClock] = timer_pointer->clock_def("CRASH", "CSH");
-    clock[BasisConditionClock] =
-        timer_pointer->clock_def("BASIS_CONDITION", "CON");
-    clock[matrixSetupClock] = timer_pointer->clock_def("MATRIX_SETUP", "FST");
-    clock[setNonbasicMoveClock] =
-        timer_pointer->clock_def("SET_NONBASICMOVE", "SNM");
-    clock[DseIzClock] = timer_pointer->clock_def("DSE_IZ", "DEI");
-    clock[InvertClock] = timer_pointer->clock_def("INVERT", "INV");
-    clock[PermWtClock] = timer_pointer->clock_def("PERM_WT", "PWT");
-    clock[ComputeDualClock] = timer_pointer->clock_def("COMPUTE_DUAL", "CPD");
-    clock[CorrectDualClock] = timer_pointer->clock_def("CORRECT_DUAL", "CRD");
-    clock[ComputePrimalClock] =
-        timer_pointer->clock_def("COMPUTE_PRIMAL", "CPP");
-    clock[CollectPrIfsClock] =
-        timer_pointer->clock_def("COLLECT_PR_IFS", "IFS");
-    clock[ComputePrIfsClock] =
-        timer_pointer->clock_def("COMPUTE_PR_IFS", "PIF");
-    clock[ComputeDuIfsClock] =
-        timer_pointer->clock_def("COMPUTE_DU_IFS", "DIF");
-    clock[ComputeDuObjClock] =
-        timer_pointer->clock_def("COMPUTE_DU_OBJ", "DOB");
-    clock[ComputePrObjClock] =
-        timer_pointer->clock_def("COMPUTE_PR_OBJ", "POB");
-    clock[ReportRebuildClock] =
-        timer_pointer->clock_def("REPORT_REBUILD", "RPR");
-    clock[ChuzrDualClock] = timer_pointer->clock_def("CHUZR_DUAL", "CRD");
-    clock[Chuzr1Clock] = timer_pointer->clock_def("CHUZR1", "CR1");
-    clock[Chuzr2Clock] = timer_pointer->clock_def("CHUZR2", "CR2");
-    clock[ChuzcPrimalClock] = timer_pointer->clock_def("CHUZC_PRIMAL", "CCP");
+        timer_pointer->clock_def("IZ_SIMPLEX_CO_BD");
+    clock[ScaleClock] = timer_pointer->clock_def("SCALE");
+    clock[CrashClock] = timer_pointer->clock_def("CRASH");
+    clock[BasisConditionClock] = timer_pointer->clock_def("BASIS_CONDITION");
+    clock[matrixSetupClock] = timer_pointer->clock_def("MATRIX_SETUP");
+    clock[setNonbasicMoveClock] = timer_pointer->clock_def("SET_NONBASICMOVE");
+    clock[DseIzClock] = timer_pointer->clock_def("DSE_IZ");
+    clock[InvertClock] = timer_pointer->clock_def("INVERT");
+    clock[PermWtClock] = timer_pointer->clock_def("PERM_WT");
+    clock[ComputeDualClock] = timer_pointer->clock_def("COMPUTE_DUAL");
+    clock[CorrectDualClock] = timer_pointer->clock_def("CORRECT_DUAL");
+    clock[ComputePrimalClock] = timer_pointer->clock_def("COMPUTE_PRIMAL");
+    clock[CollectPrIfsClock] = timer_pointer->clock_def("COLLECT_PR_IFS");
+    clock[ComputePrIfsClock] = timer_pointer->clock_def("COMPUTE_PR_IFS");
+    clock[ComputeDuIfsClock] = timer_pointer->clock_def("COMPUTE_DU_IFS");
+    clock[ComputeDuObjClock] = timer_pointer->clock_def("COMPUTE_DU_OBJ");
+    clock[ComputePrObjClock] = timer_pointer->clock_def("COMPUTE_PR_OBJ");
+    clock[ReportRebuildClock] = timer_pointer->clock_def("REPORT_REBUILD");
+    clock[ChuzrDualClock] = timer_pointer->clock_def("CHUZR_DUAL");
+    clock[Chuzr1Clock] = timer_pointer->clock_def("CHUZR1");
+    clock[Chuzr2Clock] = timer_pointer->clock_def("CHUZR2");
+    clock[ChuzcPrimalClock] = timer_pointer->clock_def("CHUZC_PRIMAL");
     clock[ChuzcHyperInitialiselClock] =
-        timer_pointer->clock_def("CHUZC_HYPER_IZ", "CHI");
+        timer_pointer->clock_def("CHUZC_HYPER_IZ");
     clock[ChuzcHyperBasicFeasibilityChangeClock] =
-        timer_pointer->clock_def("CHUZC_HYPER_FEAS", "CHF");
-    clock[ChuzcHyperDualClock] =
-        timer_pointer->clock_def("CHUZC_HYPER_DUAL", "CHD");
-    clock[ChuzcHyperClock] = timer_pointer->clock_def("CHUZC_HYPER", "CHC");
-    clock[Chuzc0Clock] = timer_pointer->clock_def("CHUZC0", "CC0");
-    clock[PriceChuzc1Clock] = timer_pointer->clock_def("PRICE_CHUZC1", "PC1");
-    clock[Chuzc1Clock] = timer_pointer->clock_def("CHUZC1", "CC1");
-    clock[Chuzc2Clock] = timer_pointer->clock_def("CHUZC2", "CC2");
-    clock[Chuzc3Clock] = timer_pointer->clock_def("CHUZC3", "CC3");
-    clock[Chuzc4Clock] = timer_pointer->clock_def("CHUZC4", "CC4");
-    clock[Chuzc4a0Clock] = timer_pointer->clock_def("CHUZC4a0", "C40");
-    clock[Chuzc4a1Clock] = timer_pointer->clock_def("CHUZC4a1", "C41");
-    clock[Chuzc4bClock] = timer_pointer->clock_def("CHUZC4b", "C4b");
-    clock[Chuzc4cClock] = timer_pointer->clock_def("CHUZC4c", "C4c");
-    clock[Chuzc4dClock] = timer_pointer->clock_def("CHUZC4d", "C4d");
-    clock[Chuzc4eClock] = timer_pointer->clock_def("CHUZC4e", "C4e");
-    clock[Chuzc5Clock] = timer_pointer->clock_def("CHUZC5", "CC5");
-    clock[DevexWtClock] = timer_pointer->clock_def("DEVEX_WT", "DWT");
-    clock[BtranClock] = timer_pointer->clock_def("BTRAN", "REP");
+        timer_pointer->clock_def("CHUZC_HYPER_FEAS");
+    clock[ChuzcHyperDualClock] = timer_pointer->clock_def("CHUZC_HYPER_DUAL");
+    clock[ChuzcHyperClock] = timer_pointer->clock_def("CHUZC_HYPER");
+    clock[Chuzc0Clock] = timer_pointer->clock_def("CHUZC0");
+    clock[PriceChuzc1Clock] = timer_pointer->clock_def("PRICE_CHUZC1");
+    clock[Chuzc1Clock] = timer_pointer->clock_def("CHUZC1");
+    clock[Chuzc2Clock] = timer_pointer->clock_def("CHUZC2");
+    clock[Chuzc3Clock] = timer_pointer->clock_def("CHUZC3");
+    clock[Chuzc4Clock] = timer_pointer->clock_def("CHUZC4");
+    clock[Chuzc4a0Clock] = timer_pointer->clock_def("CHUZC4a0");
+    clock[Chuzc4a1Clock] = timer_pointer->clock_def("CHUZC4a1");
+    clock[Chuzc4bClock] = timer_pointer->clock_def("CHUZC4b");
+    clock[Chuzc4cClock] = timer_pointer->clock_def("CHUZC4c");
+    clock[Chuzc4dClock] = timer_pointer->clock_def("CHUZC4d");
+    clock[Chuzc4eClock] = timer_pointer->clock_def("CHUZC4e");
+    clock[Chuzc5Clock] = timer_pointer->clock_def("CHUZC5");
+    clock[DevexWtClock] = timer_pointer->clock_def("DEVEX_WT");
+    clock[BtranClock] = timer_pointer->clock_def("BTRAN");
     clock[BtranBasicFeasibilityChangeClock] =
-        timer_pointer->clock_def("BTRAN_FEAS", "BT1");
-    clock[BtranFullClock] = timer_pointer->clock_def("BTRAN_FULL", "BTF");
-    clock[PriceClock] = timer_pointer->clock_def("PRICE", "RAP");
+        timer_pointer->clock_def("BTRAN_FEAS");
+    clock[BtranFullClock] = timer_pointer->clock_def("BTRAN_FULL");
+    clock[PriceClock] = timer_pointer->clock_def("PRICE");
     clock[PriceBasicFeasibilityChangeClock] =
-        timer_pointer->clock_def("PRICE_FEAS", "PC1");
-    clock[PriceFullClock] = timer_pointer->clock_def("PRICE_FULL", "PCF");
-    clock[FtranClock] = timer_pointer->clock_def("FTRAN", "COL");
-    clock[FtranDseClock] = timer_pointer->clock_def("FTRAN_DSE", "DSE");
-    clock[BtranPseClock] = timer_pointer->clock_def("BTRAN_PSE", "PSE");
-    clock[FtranMixParClock] = timer_pointer->clock_def("FTRAN_MIX_PAR", "FMP");
-    clock[FtranMixFinalClock] =
-        timer_pointer->clock_def("FTRAN_MIX_FINAL", "FMF");
-    clock[FtranBfrtClock] = timer_pointer->clock_def("FTRAN_BFRT", "BFR");
-    clock[UpdateRowClock] = timer_pointer->clock_def("UPDATE_ROW", "UPR");
-    clock[UpdateDualClock] = timer_pointer->clock_def("UPDATE_DUAL", "UPD");
+        timer_pointer->clock_def("PRICE_FEAS");
+    clock[PriceFullClock] = timer_pointer->clock_def("PRICE_FULL");
+    clock[FtranClock] = timer_pointer->clock_def("FTRAN");
+    clock[FtranDseClock] = timer_pointer->clock_def("FTRAN_DSE");
+    clock[BtranPseClock] = timer_pointer->clock_def("BTRAN_PSE");
+    clock[FtranMixParClock] = timer_pointer->clock_def("FTRAN_MIX_PAR");
+    clock[FtranMixFinalClock] = timer_pointer->clock_def("FTRAN_MIX_FINAL");
+    clock[FtranBfrtClock] = timer_pointer->clock_def("FTRAN_BFRT");
+    clock[UpdateRowClock] = timer_pointer->clock_def("UPDATE_ROW");
+    clock[UpdateDualClock] = timer_pointer->clock_def("UPDATE_DUAL");
     clock[UpdateDualBasicFeasibilityChangeClock] =
-        timer_pointer->clock_def("UPDATE_DUAL_FEAS", "UD1");
-    clock[UpdatePrimalClock] = timer_pointer->clock_def("UPDATE_PRIMAL", "UPP");
-    clock[DevexIzClock] = timer_pointer->clock_def("DEVEX_IZ", "DIZ");
+        timer_pointer->clock_def("UPDATE_DUAL_FEAS");
+    clock[UpdatePrimalClock] = timer_pointer->clock_def("UPDATE_PRIMAL");
+    clock[DevexIzClock] = timer_pointer->clock_def("DEVEX_IZ");
     clock[DevexUpdateWeightClock] =
-        timer_pointer->clock_def("UPDATE_DVX_WEIGHT", "UDW");
-    clock[DseUpdateWeightClock] =
-        timer_pointer->clock_def("UPDATE_DSE_WEIGHT", "USW");
-    clock[UpdatePivotsClock] = timer_pointer->clock_def("UPDATE_PIVOTS", "UPP");
-    clock[UpdateFactorClock] = timer_pointer->clock_def("UPDATE_FACTOR", "UPF");
-    clock[UpdateMatrixClock] = timer_pointer->clock_def("UPDATE_MATRIX", "UPM");
-    clock[UpdateRowEpClock] = timer_pointer->clock_def("UPDATE_ROW_EP", "UPR");
+        timer_pointer->clock_def("UPDATE_DVX_WEIGHT");
+    clock[DseUpdateWeightClock] = timer_pointer->clock_def("UPDATE_DSE_WEIGHT");
+    clock[UpdatePivotsClock] = timer_pointer->clock_def("UPDATE_PIVOTS");
+    clock[UpdateFactorClock] = timer_pointer->clock_def("UPDATE_FACTOR");
+    clock[UpdateMatrixClock] = timer_pointer->clock_def("UPDATE_MATRIX");
+    clock[UpdateRowEpClock] = timer_pointer->clock_def("UPDATE_ROW_EP");
   }
 
   bool reportSimplexClockList(const char* grepStamp,

casadi/include/highs/test/DevKkt.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/test/KktCh2.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/FactorTimer.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -91,76 +88,54 @@ class FactorTimer {
     HighsTimer* timer_pointer = factor_timer_clock.timer_pointer_;
     std::vector<HighsInt>& clock = factor_timer_clock.clock_;
     clock.resize(FactorNumClock);
-    clock[FactorInvert] = timer_pointer->clock_def("INVERT", "INV");
-    clock[FactorInvertSimple] =
-        timer_pointer->clock_def("INVERT Simple", "IVS");
-    clock[FactorInvertKernel] =
-        timer_pointer->clock_def("INVERT Kernel", "IVK");
-    clock[FactorInvertDeficient] =
-        timer_pointer->clock_def("INVERT Deficient", "IVD");
-    clock[FactorInvertFinish] =
-        timer_pointer->clock_def("INVERT Finish", "IVF");
-    clock[FactorFtran] = timer_pointer->clock_def("FTRAN", "FTR");
-    clock[FactorFtranLower] = timer_pointer->clock_def("FTRAN Lower", "FTL");
-    clock[FactorFtranLowerAPF] =
-        timer_pointer->clock_def("FTRAN Lower APF", "FLA");
-    clock[FactorFtranLowerDse] =
-        timer_pointer->clock_def("FTRAN Lower Dse", "FLD");
-    clock[FactorFtranLowerSps] =
-        timer_pointer->clock_def("FTRAN Lower Sps", "FLS");
+    clock[FactorInvert] = timer_pointer->clock_def("INVERT");
+    clock[FactorInvertSimple] = timer_pointer->clock_def("INVERT Simple");
+    clock[FactorInvertKernel] = timer_pointer->clock_def("INVERT Kernel");
+    clock[FactorInvertDeficient] = timer_pointer->clock_def("INVERT Deficient");
+    clock[FactorInvertFinish] = timer_pointer->clock_def("INVERT Finish");
+    clock[FactorFtran] = timer_pointer->clock_def("FTRAN");
+    clock[FactorFtranLower] = timer_pointer->clock_def("FTRAN Lower");
+    clock[FactorFtranLowerAPF] = timer_pointer->clock_def("FTRAN Lower APF");
+    clock[FactorFtranLowerDse] = timer_pointer->clock_def("FTRAN Lower Dse");
+    clock[FactorFtranLowerSps] = timer_pointer->clock_def("FTRAN Lower Sps");
     clock[FactorFtranLowerHyper] =
-        timer_pointer->clock_def("FTRAN Lower Hyper", "FLH");
-    clock[FactorFtranUpper] = timer_pointer->clock_def("FTRAN Upper", "FTU");
-    clock[FactorFtranUpperFT] =
-        timer_pointer->clock_def("FTRAN Upper FT", "FUF");
-    clock[FactorFtranUpperMPF] =
-        timer_pointer->clock_def("FTRAN Upper MPF", "FUM");
-    clock[FactorFtranUpperDse] =
-        timer_pointer->clock_def("FTRAN Upper Dse", "FUD");
-    clock[FactorFtranUpperSps0] =
-        timer_pointer->clock_def("FTRAN Upper Sps0", "FUS");
-    clock[FactorFtranUpperSps1] =
-        timer_pointer->clock_def("FTRAN Upper Sps1", "FUS");
-    clock[FactorFtranUpperSps2] =
-        timer_pointer->clock_def("FTRAN Upper Sps2", "FUS");
+        timer_pointer->clock_def("FTRAN Lower Hyper");
+    clock[FactorFtranUpper] = timer_pointer->clock_def("FTRAN Upper");
+    clock[FactorFtranUpperFT] = timer_pointer->clock_def("FTRAN Upper FT");
+    clock[FactorFtranUpperMPF] = timer_pointer->clock_def("FTRAN Upper MPF");
+    clock[FactorFtranUpperDse] = timer_pointer->clock_def("FTRAN Upper Dse");
+    clock[FactorFtranUpperSps0] = timer_pointer->clock_def("FTRAN Upper Sps0");
+    clock[FactorFtranUpperSps1] = timer_pointer->clock_def("FTRAN Upper Sps1");
+    clock[FactorFtranUpperSps2] = timer_pointer->clock_def("FTRAN Upper Sps2");
     clock[FactorFtranUpperHyper0] =
-        timer_pointer->clock_def("FTRAN Upper Hyper0", "FUH");
+        timer_pointer->clock_def("FTRAN Upper Hyper0");
     clock[FactorFtranUpperHyper1] =
-        timer_pointer->clock_def("FTRAN Upper Hyper1", "FUH");
+        timer_pointer->clock_def("FTRAN Upper Hyper1");
     clock[FactorFtranUpperHyper2] =
-        timer_pointer->clock_def("FTRAN Upper Hyper2", "FUH");
+        timer_pointer->clock_def("FTRAN Upper Hyper2");
     clock[FactorFtranUpperHyper3] =
-        timer_pointer->clock_def("FTRAN Upper Hyper3", "FUH");
+        timer_pointer->clock_def("FTRAN Upper Hyper3");
     clock[FactorFtranUpperHyper4] =
-        timer_pointer->clock_def("FTRAN Upper Hyper4", "FUH");
+        timer_pointer->clock_def("FTRAN Upper Hyper4");
     clock[FactorFtranUpperHyper5] =
-        timer_pointer->clock_def("FTRAN Upper Hyper5", "FUH");
-    clock[FactorFtranUpperPF] =
-        timer_pointer->clock_def("FTRAN Upper PF", "FUP");
-    clock[FactorBtran] = timer_pointer->clock_def("BTRAN", "BTR");
-    clock[FactorBtranLower] = timer_pointer->clock_def("BTRAN Lower", "BTL");
-    clock[FactorBtranLowerDse] =
-        timer_pointer->clock_def("BTRAN Lower Dse", "BLD");
-    clock[FactorBtranLowerSps] =
-        timer_pointer->clock_def("BTRAN Lower Sps", "BLS");
+        timer_pointer->clock_def("FTRAN Upper Hyper5");
+    clock[FactorFtranUpperPF] = timer_pointer->clock_def("FTRAN Upper PF");
+    clock[FactorBtran] = timer_pointer->clock_def("BTRAN");
+    clock[FactorBtranLower] = timer_pointer->clock_def("BTRAN Lower");
+    clock[FactorBtranLowerDse] = timer_pointer->clock_def("BTRAN Lower Dse");
+    clock[FactorBtranLowerSps] = timer_pointer->clock_def("BTRAN Lower Sps");
     clock[FactorBtranLowerHyper] =
-        timer_pointer->clock_def("BTRAN Lower Hyper", "BLH");
-    clock[FactorBtranLowerAPF] =
-        timer_pointer->clock_def("BTRAN Lower APF", "BLA");
-    clock[FactorBtranUpper] = timer_pointer->clock_def("BTRAN Upper", "BTU");
-    clock[FactorBtranUpperPF] =
-        timer_pointer->clock_def("BTRAN Upper PF", "BUP");
-    clock[FactorBtranUpperDse] =
-        timer_pointer->clock_def("BTRAN Upper Dse", "BUD");
-    clock[FactorBtranUpperSps] =
-        timer_pointer->clock_def("BTRAN Upper Sps", "BUS");
+        timer_pointer->clock_def("BTRAN Lower Hyper");
+    clock[FactorBtranLowerAPF] = timer_pointer->clock_def("BTRAN Lower APF");
+    clock[FactorBtranUpper] = timer_pointer->clock_def("BTRAN Upper");
+    clock[FactorBtranUpperPF] = timer_pointer->clock_def("BTRAN Upper PF");
+    clock[FactorBtranUpperDse] = timer_pointer->clock_def("BTRAN Upper Dse");
+    clock[FactorBtranUpperSps] = timer_pointer->clock_def("BTRAN Upper Sps");
     clock[FactorBtranUpperHyper] =
-        timer_pointer->clock_def("BTRAN Upper Hyper", "BUH");
-    clock[FactorBtranUpperFT] =
-        timer_pointer->clock_def("BTRAN Upper FT", "BUF");
-    clock[FactorBtranUpperMPF] =
-        timer_pointer->clock_def("BTRAN Upper MPS", "BUM");
-    clock[FactorReinvert] = timer_pointer->clock_def("ReINVERT", "RIV");
+        timer_pointer->clock_def("BTRAN Upper Hyper");
+    clock[FactorBtranUpperFT] = timer_pointer->clock_def("BTRAN Upper FT");
+    clock[FactorBtranUpperMPF] = timer_pointer->clock_def("BTRAN Upper MPS");
+    clock[FactorReinvert] = timer_pointer->clock_def("ReINVERT");
   };
 
   void reportFactorClockList(const char* grepStamp,

casadi/include/highs/util/HFactor.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -132,7 +129,9 @@ class HFactor {
         build_timer_(nullptr),
         nwork(0),
         u_merit_x(0),
-        u_total_x(0){};
+        // clang-format off
+        u_total_x(0) {};
+  // clang-format on
 
   /**
    * @brief Copy problem size and pointers of constraint matrix, and set
@@ -347,6 +346,7 @@ class HFactor {
   HighsInt num_row;
   HighsInt num_col;
   HighsInt num_basic;
+  double inv_num_row;  // 1.0/num_row
 
  private:
   bool a_matrix_valid;

casadi/include/highs/util/HFactorConst.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HFactorDebug.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HSet.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HVector.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HVectorBase.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -77,7 +74,7 @@ class HVectorBase {
   vector<Real> packValue;      //!< Packed values
 
   /**
-   * @brief Copy from another HVector structure to this instanc
+   * @brief Copy from another HVector structure to this instance
    */
   template <typename FromReal>
   void copy(const HVectorBase<FromReal>*

casadi/include/highs/util/HighsCDouble.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -289,6 +286,12 @@ class HighsCDouble {
   }
 
   friend HighsCDouble floor(const HighsCDouble& x) {
+    // Treat |x| < 1 as special case, as per (for example)
+    // https://github.com/shibatch/tlfloat: see #2041
+    if (abs(x) < 1) {
+      if (x == 0 || x > 0) return HighsCDouble(0.0);
+      return HighsCDouble(-1.0);
+    }
     double floor_x = std::floor(double(x));
     HighsCDouble res;
 
@@ -297,6 +300,12 @@ class HighsCDouble {
   }
 
   friend HighsCDouble ceil(const HighsCDouble& x) {
+    // Treat |x| < 1 as special case, as per (for example)
+    // https://github.com/shibatch/tlfloat: see #2041
+    if (abs(x) < 1) {
+      if (x == 0 || x < 0) return HighsCDouble(0.0);
+      return HighsCDouble(1.0);
+    }
     double ceil_x = std::ceil(double(x));
     HighsCDouble res;
 

casadi/include/highs/util/HighsComponent.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HighsDataStack.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HighsDisjointSets.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

casadi/include/highs/util/HighsHash.h

@@ -2,9 +2,6 @@
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */
-/*    Written and engineered 2008-2024 by Julian Hall, Ivet Galabova,    */
-/*    Leona Gottwald and Michael Feldmeier                               */
-/*                                                                       */
 /*    Available as open-source under the MIT License                     */
 /*                                                                       */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -119,13 +116,13 @@ struct HighsHashHelpers {
     else
       _BitScanReverse(&result, (n & 0xffffffffu));
 #endif
-    return result;
+    return static_cast<int>(result);
   }
 
   static int log2i(uint32_t n) {
     unsigned long result;
-    _BitScanReverse(&result, (unsigned long)n);
-    return result;
+    _BitScanReverse(&result, static_cast<unsigned long>(n));
+    return static_cast<int>(result);
   }
 
   static int popcnt(uint64_t x) {
@@ -304,7 +301,7 @@ struct HighsHashHelpers {
     // algorithm for multiplication mod M61 might not work properly due to
     // overflow
     u64 a = c[index & 63] & M61();
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
 
     hash += multiply_modM61(value, modexp_M61(a, degree));
     hash = (hash >> 61) + (hash & M61());
@@ -325,7 +322,7 @@ struct HighsHashHelpers {
     value = ((value << 1) & M61()) | 1;
 
     u64 a = c[index & 63] & M61();
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
     // add the additive inverse (M61() - hashvalue) instead of the hash value
     // itself
     hash += M61() - multiply_modM61(value, modexp_M61(a, degree));
@@ -338,7 +335,7 @@ struct HighsHashHelpers {
   /// useful for sparse hashing of bit vectors
   static void sparse_combine(u64& hash, HighsInt index) {
     u64 a = c[index & 63] & M61();
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
 
     hash += modexp_M61(a, degree);
     hash = (hash >> 61) + (hash & M61());
@@ -358,7 +355,7 @@ struct HighsHashHelpers {
     // procedure.
 
     u64 a = c[index & 63] & M61();
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
     // add the additive inverse (M61() - hashvalue) instead of the hash value
     // itself
     hash += M61() - modexp_M61(a, degree);
@@ -390,7 +387,7 @@ struct HighsHashHelpers {
     // algorithm for multiplication mod M31 might not work properly due to
     // overflow
     u32 a = static_cast<u32>(c[index & 63] & M31());
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
 
     u64 result = hash;
     result += multiply_modM31(static_cast<u32>(value), modexp_M31(a, degree));
@@ -413,7 +410,7 @@ struct HighsHashHelpers {
     value = (pair_hash<0>(static_cast<u32>(value), value >> 32) >> 33) | 1;
 
     u32 a = static_cast<u32>(c[index & 63] & M31());
-    HighsInt degree = (index >> 6) + 1;
+    u64 degree = (static_cast<u64>(index) >> 6) + 1;
     // add the additive inverse (M31() - hashvalue) instead of the hash value
     // itself
     u64 result = hash;