pyconvexity 0.3.8.post2__py3-none-any.whl → 0.3.8.post3__py3-none-any.whl

pyconvexity/_version.py

@@ -1 +1 @@
-__version__ = "0.3.8.post2"
+__version__ = "0.3.8.post3"

pyconvexity/solvers/pypsa/solver.py

@@ -75,7 +75,9 @@ class NetworkSolver:
             
             # Validate that it's a known solver
             known_solvers = ['highs', 'gurobi', 'gurobi (barrier)', 'gurobi (barrier homogeneous)', 
-                           'gurobi (barrier+crossover balanced)', 'gurobi (dual simplex)', 'cplex', 'glpk', 'cbc', 'scip']
+                           'gurobi (barrier+crossover balanced)', 'gurobi (dual simplex)', 
+                           'mosek', 'mosek (default)', 'mosek (barrier)', 'mosek (barrier+crossover)', 'mosek (dual simplex)',
+                           'cplex', 'glpk', 'cbc', 'scip']
             
             if default_solver in known_solvers:
                 return default_solver
@@ -367,8 +369,128 @@ class NetworkSolver:
                 gurobi_dual_options.update(solver_options)
             return 'gurobi', gurobi_dual_options
         
+        # Handle special Mosek configurations
+        elif solver_name == 'mosek (default)':
+            # No custom options - let Mosek use its default configuration
+            mosek_default_options = {
+                'solver_options': {
+                    'MSK_IPAR_LOG': 10,                       # Enable full logging (10 = verbose)
+                    'MSK_IPAR_LOG_INTPNT': 1,                 # Log interior-point progress
+                    'MSK_IPAR_LOG_SIM': 4,                    # Log simplex progress
+                    'MSK_IPAR_LOG_MIO': 4,                    # Log MIP progress (4 = full)
+                    'MSK_IPAR_LOG_MIO_FREQ': 10,              # Log MIP every 10 seconds
+                }
+            }
+            if solver_options:
+                mosek_default_options['solver_options'].update(solver_options)
+            logger.info(f"Using Mosek with default configuration (auto-select optimizer)")
+            return 'mosek', mosek_default_options
+        
+        elif solver_name == 'mosek (barrier)':
+            mosek_barrier_options = {
+                'solver_options': {
+                    'MSK_IPAR_INTPNT_BASIS': 0,                # Skip crossover (barrier-only) - 0 = MSK_BI_NEVER
+                    'MSK_DPAR_INTPNT_TOL_REL_GAP': 1e-5,      # Relaxed relative gap tolerance
+                    'MSK_DPAR_INTPNT_TOL_PFEAS': 1e-6,        # Primal feasibility tolerance
+                    'MSK_DPAR_INTPNT_TOL_DFEAS': 1e-6,        # Dual feasibility tolerance
+                    'MSK_DPAR_INTPNT_TOL_INFEAS': 1e-8,       # Infeasibility tolerance
+                    'MSK_IPAR_NUM_THREADS': 4,                # Number of threads
+                    'MSK_IPAR_PRESOLVE_USE': 1,               # Force presolve (1 = ON)
+                    'MSK_IPAR_PRESOLVE_LINDEP_USE': 1,        # Linear dependency check (1 = ON)
+                    'MSK_DPAR_MIO_REL_GAP_CONST': 1e-5,       # MIP relative gap tolerance
+                    'MSK_IPAR_MIO_NODE_OPTIMIZER': 4,         # Use interior-point for MIP nodes (4 = MSK_OPTIMIZER_INTPNT)
+                    'MSK_IPAR_MIO_ROOT_OPTIMIZER': 4,         # Use interior-point for MIP root (4 = MSK_OPTIMIZER_INTPNT)
+                    'MSK_IPAR_LOG': 10,                       # Enable full logging (10 = verbose)
+                    'MSK_IPAR_LOG_INTPNT': 1,                 # Log interior-point progress
+                    'MSK_IPAR_LOG_MIO': 4,                    # Log MIP progress (4 = full)
+                    'MSK_IPAR_LOG_MIO_FREQ': 10,              # Log MIP every 10 seconds
+                    # Note: Don't force MSK_IPAR_OPTIMIZER - let Mosek choose based on problem type (LP vs MILP)
+                }
+            }
+            if solver_options:
+                mosek_barrier_options['solver_options'].update(solver_options)
+            logger.info(f"Using Mosek Barrier (no crossover) configuration with verbose logging")
+            return 'mosek', mosek_barrier_options
+        
+        elif solver_name == 'mosek (barrier+crossover)':
+            mosek_barrier_crossover_options = {
+                'solver_options': {
+                    'MSK_IPAR_INTPNT_BASIS': 1,                # Always crossover (1 = MSK_BI_ALWAYS)
+                    'MSK_DPAR_INTPNT_TOL_REL_GAP': 1e-6,      # Tighter relative gap tolerance
+                    'MSK_DPAR_INTPNT_TOL_PFEAS': 1e-6,        # Primal feasibility tolerance
+                    'MSK_DPAR_INTPNT_TOL_DFEAS': 1e-6,        # Dual feasibility tolerance
+                    'MSK_IPAR_NUM_THREADS': 4,                # Number of threads
+                    'MSK_IPAR_PRESOLVE_USE': 1,               # Force presolve
+                    'MSK_IPAR_PRESOLVE_LINDEP_USE': 1,        # Linear dependency check
+                    'MSK_DPAR_MIO_REL_GAP_CONST': 1e-6,       # MIP relative gap tolerance
+                    'MSK_IPAR_MIO_NODE_OPTIMIZER': 4,         # Use interior-point for MIP nodes
+                    'MSK_IPAR_MIO_ROOT_OPTIMIZER': 4,         # Use interior-point for MIP root
+                    'MSK_IPAR_LOG': 10,                       # Enable full logging (10 = verbose)
+                    'MSK_IPAR_LOG_INTPNT': 1,                 # Log interior-point progress
+                    'MSK_IPAR_LOG_MIO': 4,                    # Log MIP progress (4 = full)
+                    'MSK_IPAR_LOG_MIO_FREQ': 10,              # Log MIP every 10 seconds
+                    # Note: Don't force MSK_IPAR_OPTIMIZER - let Mosek choose based on problem type
+                }
+            }
+            if solver_options:
+                mosek_barrier_crossover_options['solver_options'].update(solver_options)
+            logger.info(f"Using Mosek Barrier+Crossover configuration with verbose logging")
+            return 'mosek', mosek_barrier_crossover_options
+        
+        elif solver_name == 'mosek (dual simplex)':
+            mosek_dual_options = {
+                'solver_options': {
+                    'MSK_IPAR_NUM_THREADS': 0,                # Use all available cores (0 = automatic)
+                    'MSK_IPAR_PRESOLVE_USE': 1,               # Force presolve
+                    'MSK_IPAR_SIM_SCALING': 2,                # Aggressive scaling (2 = MSK_SCALING_AGGRESSIVE)
+                    'MSK_DPAR_MIO_REL_GAP_CONST': 1e-6,       # MIP relative gap tolerance
+                    'MSK_IPAR_MIO_NODE_OPTIMIZER': 1,         # Use dual simplex for MIP nodes (1 = MSK_OPTIMIZER_DUAL_SIMPLEX)
+                    'MSK_IPAR_MIO_ROOT_OPTIMIZER': 1,         # Use dual simplex for MIP root
+                    'MSK_IPAR_LOG': 10,                       # Enable full logging (10 = verbose)
+                    'MSK_IPAR_LOG_SIM': 4,                    # Log simplex progress (4 = full)
+                    'MSK_IPAR_LOG_MIO': 4,                    # Log MIP progress (4 = full)
+                    'MSK_IPAR_LOG_MIO_FREQ': 10,              # Log MIP every 10 seconds
+                    # Note: For pure LP, set optimizer; for MILP, only set node/root optimizers
+                }
+            }
+            if solver_options:
+                mosek_dual_options['solver_options'].update(solver_options)
+            logger.info(f"Using Mosek Dual Simplex configuration with verbose logging")
+            return 'mosek', mosek_dual_options
+        
         # Check if this is a known valid solver name
-        elif solver_name in ['highs', 'gurobi', 'cplex', 'glpk', 'cbc', 'scip', 'copt', 'mosek']:
+        elif solver_name == 'mosek':
+            # Add default MILP-friendly settings for plain Mosek
+            mosek_defaults = {
+                'solver_options': {
+                    'MSK_DPAR_MIO_REL_GAP_CONST': 1e-4,       # MIP relative gap tolerance (10^-4 = 0.01%)
+                    'MSK_IPAR_MIO_MAX_TIME': 3600,            # Max time 1 hour
+                    'MSK_IPAR_NUM_THREADS': 0,                # Use all cores (0 = auto)
+                    'MSK_IPAR_LOG': 4,                        # Moderate logging
+                    'MSK_IPAR_LOG_MIO': 2,                    # Log MIP occasionally
+                }
+            }
+            if solver_options:
+                mosek_defaults['solver_options'].update(solver_options)
+            logger.info(f"Using Mosek with default MILP-friendly settings")
+            return solver_name, mosek_defaults
+        
+        elif solver_name == 'gurobi':
+            # Add default MILP-friendly settings for plain Gurobi (for consistency)
+            gurobi_defaults = {
+                'solver_options': {
+                    'MIPGap': 1e-4,          # 0.01% gap
+                    'TimeLimit': 3600,       # 1 hour
+                    'Threads': 0,            # Use all cores
+                    'OutputFlag': 1,         # Enable output
+                }
+            }
+            if solver_options:
+                gurobi_defaults['solver_options'].update(solver_options)
+            logger.info(f"Using Gurobi with default MILP-friendly settings")
+            return solver_name, gurobi_defaults
+        
+        elif solver_name in ['highs', 'cplex', 'glpk', 'cbc', 'scip', 'copt']:
             return solver_name, solver_options
         
         else:

{pyconvexity-0.3.8.post2.dist-info → pyconvexity-0.3.8.post3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyconvexity
-Version: 0.3.8.post2
+Version: 0.3.8.post3
 Summary: Python library for energy system modeling and optimization with PyPSA
 Author-email: Convexity Team <info@convexity.com>
 License: MIT

{pyconvexity-0.3.8.post2.dist-info → pyconvexity-0.3.8.post3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyconvexity/__init__.py,sha256=eiAFroO4n-z8F0jTLpJgBIO7vtSxu9ovu3G2N-qqpUo,4783
-pyconvexity/_version.py,sha256=5t0ABI3rYvXT23PJYWULhcBoa2OPGm5Tmm8NT3aXvDk,28
+pyconvexity/_version.py,sha256=jxRGlI_N8vedEkv7nqYjYQvDc31-O3CwZMs1KZ9Odq8,28
 pyconvexity/timeseries.py,sha256=4p1Tdpa1otqDvCq2zppA4tw660sF_XWb8Xobib-cCms,11340
 pyconvexity/core/__init__.py,sha256=MgVa5rrRWIi2w1UI1P4leiBntvHeeOPv0Thm0DEXBHo,1209
 pyconvexity/core/database.py,sha256=M02q4UkJqAPeTXuwng9I7kHm16reJ7eq7wccWxnhE5I,15227
@@ -36,11 +36,11 @@ pyconvexity/solvers/pypsa/api.py,sha256=05IN6KgjpVNJ3TrH0gv1F2-GLRnffLQOc3rsT1ZE
 pyconvexity/solvers/pypsa/batch_loader.py,sha256=eQb8B11akQYtH3aK93WAOoXEI-ktk4imATw9gaYDNR4,13547
 pyconvexity/solvers/pypsa/builder.py,sha256=WrimcBvG4mNFLTrLq7131Ku0AXY_0oRKxfI81ywc5Cs,24460
 pyconvexity/solvers/pypsa/constraints.py,sha256=MycS-pvuYIEEa0s2tkskiydX_HhAKNTnsQdVc842u50,19792
-pyconvexity/solvers/pypsa/solver.py,sha256=95YdzoG6ch0niIoaPeUWCmJ01TyI0zDdNjf-bZ5FQTw,57748
+pyconvexity/solvers/pypsa/solver.py,sha256=2EB1EL6VRtYJ-KAk00vecEn8egMfdjOUaMfFuT8aPgA,65763
 pyconvexity/solvers/pypsa/storage.py,sha256=T-0qEryiEy_8G4KiscPoiiWvTPd_OGqpLczW0_Xm85E,87331
 pyconvexity/validation/__init__.py,sha256=_6SVqXkaDFqmagub_O064Zm_QIdBrOra-Gvvbo9vM4I,549
 pyconvexity/validation/rules.py,sha256=6Kak12BVfUpjmgB5B7Wre55eGc5e1dvIdFca-vN-IFI,9296
-pyconvexity-0.3.8.post2.dist-info/METADATA,sha256=ubU7D_qpYA1FtZcix27_yjOQM7bmZBTevlVWOqwfPCE,4886
-pyconvexity-0.3.8.post2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyconvexity-0.3.8.post2.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
-pyconvexity-0.3.8.post2.dist-info/RECORD,,
+pyconvexity-0.3.8.post3.dist-info/METADATA,sha256=bqoTl9zga7X365E-kBanrXKrvepNvxvFrSSEEqBwTkg,4886
+pyconvexity-0.3.8.post3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyconvexity-0.3.8.post3.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
+pyconvexity-0.3.8.post3.dist-info/RECORD,,