add configuration class

config_page.py

@@ -7,6 +7,8 @@ import streamlit as st
 import datetime
 import sys
 import os
+from config import optimization_config
+from src.config.constants import ShiftType, LineType
 
 # Add src directory to path for imports
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'src'))
@@ -78,7 +80,8 @@ def initialize_session_state():
             MAX_HOUR_PER_PERSON_PER_DAY, MAX_HOUR_PER_SHIFT_PER_PERSON,
             MAX_PARALLEL_WORKERS, COST_LIST_PER_EMP_SHIFT,
             PAYMENT_MODE_CONFIG, LINE_CNT_PER_TYPE,
-            MAX_EMPLOYEE_PER_TYPE_ON_DAY, start_date, end_date
+            MAX_EMPLOYEE_PER_TYPE_ON_DAY, start_date, end_date,
+            shift_code_to_name
         )
         
         # Get the actual computed default values from optimization_config.py
@@ -96,35 +99,35 @@ def initialize_session_state():
             'fixed_staff_mode': FIXED_STAFF_CONSTRAINT_MODE,
             
             # Payment configuration - from optimization_config.py
-            'payment_mode_shift_1': PAYMENT_MODE_CONFIG.get(1),
-            'payment_mode_shift_2': PAYMENT_MODE_CONFIG.get(2), 
-            'payment_mode_shift_3': PAYMENT_MODE_CONFIG.get(3),
+            'payment_mode_shift_1': PAYMENT_MODE_CONFIG.get(ShiftType.REGULAR),
+            'payment_mode_shift_2': PAYMENT_MODE_CONFIG.get(ShiftType.EVENING), 
+            'payment_mode_shift_3': PAYMENT_MODE_CONFIG.get(ShiftType.OVERTIME),
             
             # Working hours - from optimization_config.py
             'max_hour_per_person_per_day': MAX_HOUR_PER_PERSON_PER_DAY,
-            'max_hours_shift_1': MAX_HOUR_PER_SHIFT_PER_PERSON.get(1),
-            'max_hours_shift_2': MAX_HOUR_PER_SHIFT_PER_PERSON.get(2),
-            'max_hours_shift_3': MAX_HOUR_PER_SHIFT_PER_PERSON.get(3),
+            'max_hours_shift_1': MAX_HOUR_PER_SHIFT_PER_PERSON.get(ShiftType.REGULAR),
+            'max_hours_shift_2': MAX_HOUR_PER_SHIFT_PER_PERSON.get(ShiftType.EVENING),
+            'max_hours_shift_3': MAX_HOUR_PER_SHIFT_PER_PERSON.get(ShiftType.OVERTIME),
             
             # Operations - from optimization_config.py
-            'max_parallel_workers_long_line': MAX_PARALLEL_WORKERS.get(6),
-            'max_parallel_workers_mini_load': MAX_PARALLEL_WORKERS.get(7),
+            'max_parallel_workers_long_line': MAX_PARALLEL_WORKERS.get(LineType.LONG_LINE),
+            'max_parallel_workers_mini_load': MAX_PARALLEL_WORKERS.get(LineType.MINI_LOAD),
             
             # Workforce limits - from optimization_config.py (computed values)
             'max_unicef_per_day': list(MAX_EMPLOYEE_PER_TYPE_ON_DAY.get("UNICEF Fixed term", {}).values())[0] if MAX_EMPLOYEE_PER_TYPE_ON_DAY.get("UNICEF Fixed term") else 8,
             'max_humanizer_per_day': list(MAX_EMPLOYEE_PER_TYPE_ON_DAY.get("Humanizer", {}).values())[0] if MAX_EMPLOYEE_PER_TYPE_ON_DAY.get("Humanizer") else 10,
             
             # Line counts - from optimization_config.py (data-driven)
-            'line_count_long_line': LINE_CNT_PER_TYPE.get(6),
-            'line_count_mini_load': LINE_CNT_PER_TYPE.get(7),
+            'line_count_long_line': LINE_CNT_PER_TYPE.get(LineType.LONG_LINE),
+            'line_count_mini_load': LINE_CNT_PER_TYPE.get(LineType.MINI_LOAD),
             
             # Cost rates - from optimization_config.py (computed or default values)
-            'unicef_rate_shift_1': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(1),
-            'unicef_rate_shift_2': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(2),
-            'unicef_rate_shift_3': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(3),
-            'humanizer_rate_shift_1': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(1),
-            'humanizer_rate_shift_2': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(2),
-            'humanizer_rate_shift_3': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(3),
+            'unicef_rate_shift_1': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(ShiftType.REGULAR),
+            'unicef_rate_shift_2': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(ShiftType.EVENING),
+            'unicef_rate_shift_3': COST_LIST_PER_EMP_SHIFT.get("UNICEF Fixed term", {}).get(ShiftType.OVERTIME),
+            'humanizer_rate_shift_1': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(ShiftType.REGULAR),
+            'humanizer_rate_shift_2': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(ShiftType.EVENING),
+            'humanizer_rate_shift_3': COST_LIST_PER_EMP_SHIFT.get("Humanizer", {}).get(ShiftType.OVERTIME),  
         }
         
     except Exception as e:
@@ -456,8 +459,8 @@ def render_data_selection_config():
     
     # Shifts selection
     st.subheader("🕐 Shifts")
-    available_shifts = [1, 2, 3]
-    shift_names = {1: "Regular", 2: "Evening", 3: "Overtime"}
+    available_shifts = list(optimization_config.shift_code_to_name().keys())
+    shift_names = optimization_config.shift_code_to_name()
     
     if 'selected_shifts' not in st.session_state:
         st.session_state.selected_shifts = available_shifts
@@ -473,8 +476,8 @@ def render_data_selection_config():
     
     # Production lines selection
     st.subheader("🏭 Production Lines")
-    available_lines = [6, 7]
-    line_names = {6: "Long Line", 7: "Mini Load"}
+    available_lines = list(optimization_config.line_code_to_name().keys())
+    line_names = optimization_config.line_code_to_name()
     
     if 'selected_lines' not in st.session_state:
         st.session_state.selected_lines = available_lines
@@ -510,9 +513,9 @@ def save_configuration():
         'evening_shift_threshold': st.session_state.evening_shift_threshold,
         'fixed_staff_mode': st.session_state.fixed_staff_mode,
         'payment_mode_config': {
-            1: st.session_state.payment_mode_shift_1,
-            2: st.session_state.payment_mode_shift_2,
-            3: st.session_state.payment_mode_shift_3,
+            ShiftType.REGULAR: st.session_state.payment_mode_shift_1,
+            ShiftType.EVENING: st.session_state.payment_mode_shift_2,
+            ShiftType.OVERTIME: st.session_state.payment_mode_shift_3,
         },
         'workforce_limits': {
             'max_unicef_per_day': st.session_state.max_unicef_per_day,
@@ -521,31 +524,31 @@ def save_configuration():
         'working_hours': {
             'max_hour_per_person_per_day': st.session_state.max_hour_per_person_per_day,
             'max_hours_per_shift': {
-                1: st.session_state.max_hours_shift_1,
-                2: st.session_state.max_hours_shift_2,
-                3: st.session_state.max_hours_shift_3,
+                ShiftType.REGULAR: st.session_state.max_hours_shift_1,
+                ShiftType.EVENING: st.session_state.max_hours_shift_2,
+                ShiftType.OVERTIME: st.session_state.max_hours_shift_3,
             }
         },
         'operations': {
             'line_counts': {
-                6: st.session_state.line_count_long_line,  # Use line IDs directly
-                7: st.session_state.line_count_mini_load,
+                LineType.LONG_LINE: st.session_state.line_count_long_line,
+                LineType.MINI_LOAD: st.session_state.line_count_mini_load,
             },
             'max_parallel_workers': {
-                6: st.session_state.max_parallel_workers_long_line,  # long line id
-                7: st.session_state.max_parallel_workers_mini_load,  # mini load id
+                LineType.LONG_LINE: st.session_state.max_parallel_workers_long_line,
+                LineType.MINI_LOAD: st.session_state.max_parallel_workers_mini_load,
             }
         },
         'cost_rates': {
             'UNICEF Fixed term': {
-                1: st.session_state.unicef_rate_shift_1,
-                2: st.session_state.unicef_rate_shift_2,
-                3: st.session_state.unicef_rate_shift_3,
+                ShiftType.REGULAR: st.session_state.unicef_rate_shift_1,
+                ShiftType.EVENING: st.session_state.unicef_rate_shift_2,
+                ShiftType.OVERTIME: st.session_state.unicef_rate_shift_3,
             },
             'Humanizer': {
-                1: st.session_state.humanizer_rate_shift_1,
-                2: st.session_state.humanizer_rate_shift_2,
-                3: st.session_state.humanizer_rate_shift_3,
+                ShiftType.REGULAR: st.session_state.humanizer_rate_shift_1,
+                ShiftType.EVENING: st.session_state.humanizer_rate_shift_2,
+                ShiftType.OVERTIME: st.session_state.humanizer_rate_shift_3,
             }
         },
         'data_selection': {
@@ -603,11 +606,11 @@ def display_user_friendly_summary(config):
     st.subheader("🏭 Operations Settings")
     col1, col2 = st.columns(2)
     with col1:
-        st.write(f"**Long Lines Available:** {config['operations']['line_counts'][6]} lines")
-        st.write(f"**Mini Load Lines Available:** {config['operations']['line_counts'][7]} lines")
+        st.write(f"**Long Lines Available:** {config['operations']['line_counts'][LineType.LONG_LINE]} lines")
+        st.write(f"**Mini Load Lines Available:** {config['operations']['line_counts'][LineType.MINI_LOAD]} lines")
     with col2:
-        st.write(f"**Max Workers per Long Line:** {config['operations']['max_parallel_workers'][6]} people")
-        st.write(f"**Max Workers per Mini Load Line:** {config['operations']['max_parallel_workers'][7]} people")
+        st.write(f"**Max Workers per Long Line:** {config['operations']['max_parallel_workers'][LineType.LONG_LINE]} people")
+        st.write(f"**Max Workers per Mini Load Line:** {config['operations']['max_parallel_workers'][LineType.MINI_LOAD]} people")
     
     # Cost Settings
     st.subheader("💰 Cost Settings")
@@ -616,15 +619,15 @@ def display_user_friendly_summary(config):
     col1, col2 = st.columns(2)
     with col1:
         st.write("*UNICEF Fixed Term Staff:*")
-        st.write(f"• Regular Shift: €{config['cost_rates']['UNICEF Fixed term'][1]:.2f}/hour")
-        st.write(f"• Evening Shift: €{config['cost_rates']['UNICEF Fixed term'][2]:.2f}/hour") 
-        st.write(f"• Overtime Shift: €{config['cost_rates']['UNICEF Fixed term'][3]:.2f}/hour")
+        st.write(f"• Regular Shift: €{config['cost_rates']['UNICEF Fixed term'][ShiftType.REGULAR]:.2f}/hour")
+        st.write(f"• Evening Shift: €{config['cost_rates']['UNICEF Fixed term'][ShiftType.EVENING]:.2f}/hour") 
+        st.write(f"• Overtime Shift: €{config['cost_rates']['UNICEF Fixed term'][ShiftType.OVERTIME]:.2f}/hour")
     
     with col2:
         st.write("*Humanizer Staff:*")
-        st.write(f"• Regular Shift: €{config['cost_rates']['Humanizer'][1]:.2f}/hour")
-        st.write(f"• Evening Shift: €{config['cost_rates']['Humanizer'][2]:.2f}/hour")
-        st.write(f"• Overtime Shift: €{config['cost_rates']['Humanizer'][3]:.2f}/hour")
+        st.write(f"• Regular Shift: €{config['cost_rates']['Humanizer'][ShiftType.REGULAR]:.2f}/hour")
+        st.write(f"• Evening Shift: €{config['cost_rates']['Humanizer'][ShiftType.EVENING]:.2f}/hour")
+        st.write(f"• Overtime Shift: €{config['cost_rates']['Humanizer'][ShiftType.OVERTIME]:.2f}/hour")
     
     # Payment Settings
     st.write("**Payment Modes:**")
@@ -635,15 +638,15 @@ def display_user_friendly_summary(config):
     
     col1, col2, col3 = st.columns(3)
     with col1:
-        mode = config['payment_mode_config'][1]
+        mode = config['payment_mode_config'][ShiftType.REGULAR]
         st.write(f"• **Regular Shift:** {mode.title()}")
         st.caption(payment_descriptions[mode])
     with col2:
-        mode = config['payment_mode_config'][2] 
+        mode = config['payment_mode_config'][ShiftType.EVENING] 
         st.write(f"• **Evening Shift:** {mode.title()}")
         st.caption(payment_descriptions[mode])
     with col3:
-        mode = config['payment_mode_config'][3]
+        mode = config['payment_mode_config'][ShiftType.OVERTIME]
         st.write(f"• **Overtime Shift:** {mode.title()}")
         st.caption(payment_descriptions[mode])
     
@@ -659,14 +662,14 @@ def display_user_friendly_summary(config):
         
         with col2:
             shifts = config['data_selection']['selected_shifts']
-            shift_names = {1: "Regular", 2: "Evening", 3: "Overtime"}
+            shift_names = ShiftType.get_all_names()
             st.write(f"**Shifts:** {len(shifts)} selected")
             for shift in shifts:
                 st.write(f"• Shift {shift} ({shift_names.get(shift, 'Unknown')})")
         
         with col3:
             lines = config['data_selection']['selected_lines']
-            line_names = {6: "Long Line", 7: "Mini Load"}
+            line_names = LineType.get_all_names()
             st.write(f"**Production Lines:** {len(lines)} selected")
             for line in lines:
                 st.write(f"• Line {line} ({line_names.get(line, 'Unknown')})")
@@ -684,7 +687,7 @@ def display_user_friendly_summary(config):
         st.metric("Max Daily Staff", f"{total_staff} people")
     
     with col3:
-        total_lines = config['operations']['line_counts'][6] + config['operations']['line_counts'][7]
+        total_lines = config['operations']['line_counts'][LineType.LONG_LINE] + config['operations']['line_counts'][LineType.MINI_LOAD]
         st.metric("Production Lines", f"{total_lines} lines")
     
     with col4:

src/config/optimization_config.py

@@ -3,6 +3,7 @@ import src.etl.transform as transformed_data
 import datetime
 from datetime import timedelta
 import src.etl.extract as extract
+from src.config.constants import ShiftType, LineType, KitLevel, DefaultConfig
 
 # Re-import all the packages
 import importlib
@@ -98,8 +99,8 @@ def get_active_shift_list():
     all_shifts = get_shift_list()
     
     if EVENING_SHIFT_MODE == "normal":
-        # Only regular (1) and overtime (3) shifts - NO evening shift
-        active_shifts = [s for s in all_shifts if s in [1, 3]]
+        # Only regular and overtime shifts - NO evening shift
+        active_shifts = [s for s in all_shifts if s in ShiftType.REGULAR_AND_OVERTIME]
         print(f"[SHIFT MODE] Normal mode: Using shifts {active_shifts} (Regular + Overtime only, NO evening)")
         
     elif EVENING_SHIFT_MODE == "activate_evening":
@@ -114,7 +115,7 @@ def get_active_shift_list():
         
     else:
         # Default to normal mode
-        active_shifts = [s for s in all_shifts if s in [1, 3]]
+        active_shifts = [s for s in all_shifts if s in ShiftType.REGULAR_AND_OVERTIME]
         print(f"[SHIFT MODE] Unknown mode '{EVENING_SHIFT_MODE}', defaulting to normal: {active_shifts}")
     
     return active_shifts
@@ -150,10 +151,10 @@ def get_kit_line_match():
     
     # Create line name to ID mapping
     line_name_to_id = {
-        "long line": 6,
-        "mini load": 7,
-        "Long_line": 6,    # Alternative naming
-        "Mini_load": 7,    # Alternative naming
+        "long line": LineType.LONG_LINE,
+        "mini load": LineType.MINI_LOAD,
+        "Long_line": LineType.LONG_LINE,    # Alternative naming
+        "Mini_load": LineType.MINI_LOAD,    # Alternative naming
     }
     
     # Convert string line names to numeric IDs
@@ -167,13 +168,13 @@ def get_kit_line_match():
             else:
                 print(f"Warning: Unknown line type '{line_name}' for kit {kit}")
                 # Default to long line if unknown
-                converted_dict[kit] = 6
+                converted_dict[kit] = LineType.LONG_LINE
         elif isinstance(line_name, (int, float)) and not pd.isna(line_name):
             # Already numeric
             converted_dict[kit] = int(line_name)
         else:
             # Missing or empty line type - default to long line
-            converted_dict[kit] = 6
+            converted_dict[kit] = LineType.LONG_LINE
             
     return converted_dict
 
@@ -231,24 +232,14 @@ def get_cost_list_per_emp_shift():
     
     print(f"Loading default cost values")
     # Default hourly rates - Important: multiple employment types with different costs
-    # Shift 1 = normal, 2 = evening, 3 = overtime 
-    return {"UNICEF Fixed term":{1:43.27,2:43.27,3:64.91},"Humanizer":{1:27.94,2:27.94,3:41.91}}
+    return DefaultConfig.DEFAULT_COST_RATES
 
 def shift_code_to_name():
-    shift_code_to_name_dict = {
-        1: "Regular",
-        2: "Evening", 
-        3: "Overtime"
-    }
-    return shift_code_to_name_dict
+    return ShiftType.get_all_names()
 
 def line_code_to_name():
     """Convert line type IDs to readable names"""
-    line_code_to_name_dict = {
-        6: "Long Line",
-        7: "Mini Load"
-    }
-    return line_code_to_name_dict
+    return LineType.get_all_names()
 
 COST_LIST_PER_EMP_SHIFT = get_cost_list_per_emp_shift()
 # print("cost list per emp shift",COST_LIST_PER_EMP_SHIFT)
@@ -339,7 +330,7 @@ print("max employee per type on day",MAX_EMPLOYEE_PER_TYPE_ON_DAY)
 # available employee but for fixed in shift 1, it is mandatory employment
 
 MAX_HOUR_PER_PERSON_PER_DAY = 14  # legal standard
-MAX_HOUR_PER_SHIFT_PER_PERSON = {1: 7.5, 2: 7.5, 3: 5} #1 = normal, 2 = evening, 3 = overtime
+MAX_HOUR_PER_SHIFT_PER_PERSON = DefaultConfig.MAX_HOUR_PER_SHIFT_PER_PERSON
 def get_per_product_speed():
     try:
         # Try to get from streamlit session state (from config page)
@@ -378,10 +369,7 @@ def get_kit_hierarchy_data():
 KIT_LEVELS, KIT_DEPENDENCIES, PRODUCTION_PRIORITY_ORDER = get_kit_hierarchy_data()
 print(f"Kit Hierarchy loaded: {len(KIT_LEVELS)} kits, Priority order: {len(PRODUCTION_PRIORITY_ORDER)} items")
 
-MAX_PARALLEL_WORKERS = {
-    6: 15,  # long line can have max 15 workers simultaneously
-    7: 15,  # mini load can have max 15 workers simultaneously
-}
+MAX_PARALLEL_WORKERS = DefaultConfig.MAX_PARALLEL_WORKERS
 # maximum number of workers that can work on a line at the same time
 
 DAILY_WEEKLY_SCHEDULE = "daily"  # daily or weekly ,this needs to be implementedin  in         if F_x1_day is not None... F_x1_week is not None... also need to change x1 to Fixedstaff_first_shift
@@ -412,13 +400,8 @@ def get_payment_mode_config():
         print(f"Could not get payment mode config from streamlit session: {e}")
     
     # Default payment mode configuration
-    # Shift 1: bulk, Shift 2: bulk (evening), Shift 3: partial (overtime)
     print(f"Loading default payment mode configuration")
-    payment_mode_config = {
-        1: "bulk",      # Regular shift - bulk payment
-        2: "bulk",      # Evening shift - bulk payment  
-        3: "partial"    # Overtime shift - partial payment
-    }
+    payment_mode_config = DefaultConfig.PAYMENT_MODE_CONFIG
     
     return payment_mode_config
 

src/models/optimizer_real.py

@@ -9,6 +9,7 @@
 
 from ortools.linear_solver import pywraplp
 from math import ceil
+from src.config.constants import ShiftType, LineType, KitLevel
 
 # ---- config import (프로젝트 경로에 맞춰 조정) ----
 from src.config.optimization_config import (
@@ -49,7 +50,7 @@ print("KIT_LINE_MATCH_DICT",KIT_LINE_MATCH_DICT)
 
 # 3) If specific product is not produced on specific date, set it to 0
 ACTIVE = {t: {p: 1 for p in PRODUCT_LIST} for t in DATE_SPAN}
-# 예: ACTIVE[2]['C'] = 0
+# Example: ACTIVE[2]['C'] = 0  # Disable product C on day 2
 
 
 def build_lines():
@@ -89,7 +90,7 @@ def sort_products_by_hierarchy(product_list):
     print(f"[HIERARCHY] Production order: {len(sorted_products)} products")
     for i, p in enumerate(sorted_products[:10]):  # Show first 10
         level = KIT_LEVELS.get(p, "unknown")
-        level_name = {0: "prepack", 1: "subkit", 2: "master"}.get(level, "unknown")
+        level_name = KitLevel.get_name(level)
         deps = KIT_DEPENDENCIES.get(p, [])
         print(f"  {i+1}. {p} (level {level}={level_name}, deps: {len(deps)})")
     
@@ -103,10 +104,8 @@ def get_dependency_timing_weight(product):
     Calculate timing weight based on hierarchy level.
     Lower levels (prepacks) should be produced earlier.
     """
-    level = KIT_LEVELS.get(product, 2)  # Default to master level
-    # Weight: prepack=0.1, subkit=0.5, master=1.0
-    weights = {0: 0.1, 1: 0.5, 2: 1.0}
-    return weights.get(level, 1.0)
+    level = KIT_LEVELS.get(product, KitLevel.MASTER)  # Default to master level
+    return KitLevel.get_timing_weight(level)
 
 def solve_fixed_team_weekly():
     # --- Sets ---
@@ -148,7 +147,7 @@ def solve_fixed_team_weekly():
         total_demand = sum(DEMAND_DICTIONARY.get(p, 0) for p in P)
         
         # Calculate maximum capacity with regular + overtime shifts only
-        regular_overtime_shifts = [s for s in S if s in [1, 3]]  # Only shifts 1, 3 (regular + overtime)
+        regular_overtime_shifts = [s for s in S if s in ShiftType.REGULAR_AND_OVERTIME]
         max_capacity = 0
         
         for p in P:
@@ -268,7 +267,7 @@ def solve_fixed_team_weekly():
 
     # 3) Product-line type compatibility + (optional) activity by day
     for p in P:
-        req_lt = KIT_LINE_MATCH_DICT.get(p, 6)  # Default to long line (6) if not found
+        req_lt = KIT_LINE_MATCH_DICT.get(p, LineType.LONG_LINE)  # Default to long line if not found
         req_total = sum(TEAM_REQ_PER_PRODUCT[e][p] for e in E)
         for ell in L:
             allowed = (ell[0] == req_lt) and (req_total <= max_workers_line.get(ell[0], 1e9))
@@ -317,24 +316,24 @@ def solve_fixed_team_weekly():
             )
 
     # 7) Shift ordering constraints (only apply if shifts are available)
-    # Evening shift (2) after regular shift (1)
-    if 2 in S and 1 in S:  # Only if both shifts are available
+    # Evening shift after regular shift
+    if ShiftType.EVENING in S and ShiftType.REGULAR in S:  # Only if both shifts are available
         for e in E:
             for t in D:
                 solver.Add(
-                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, 2, t] for p in P for ell in L)
+                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, ShiftType.EVENING, t] for p in P for ell in L)
                     <=
-                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, 1, t] for p in P for ell in L)
+                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, ShiftType.REGULAR, t] for p in P for ell in L)
                 )
     
-    # Overtime shift (3) after regular shift (1)
-    if 3 in S and 1 in S:  # Only if both shifts are available
+    # Overtime shift after regular shift
+    if ShiftType.OVERTIME in S and ShiftType.REGULAR in S:  # Only if both shifts are available
         for e in E:
             for t in D:
                 solver.Add(
-                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, 3, t] for p in P for ell in L)
+                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, ShiftType.OVERTIME, t] for p in P for ell in L)
                     <=
-                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, 1, t] for p in P for ell in L)
+                    solver.Sum(TEAM_REQ_PER_PRODUCT[e][p] * T[p, ell, ShiftType.REGULAR, t] for p in P for ell in L)
                 )
     
     # 7.5) Bulk payment linking constraints are now handled inline in the cost calculation
@@ -371,7 +370,8 @@ def solve_fixed_team_weekly():
     # --- Solve ---
     status = solver.Solve()
     if status != pywraplp.Solver.OPTIMAL:
-        print(f"No optimal solution. Status: {status} (2=INFEASIBLE)")
+        status_names = {pywraplp.Solver.INFEASIBLE: "INFEASIBLE", pywraplp.Solver.UNBOUNDED: "UNBOUNDED"}
+        print(f"No optimal solution. Status: {status} ({status_names.get(status, 'UNKNOWN')})")
         # Debug hint:
         # solver.EnableOutput()
         # solver.ExportModelAsLpFile("model.lp")
@@ -433,12 +433,15 @@ def solve_fixed_team_weekly():
 
     print("\n--- Schedule (line, shift, day) ---")
     for row in schedule:
-        print(f"D{row['day']} L{row['line_type_id']}-{row['line_idx']} S{row['shift']}: "
+        shift_name = ShiftType.get_name(row['shift'])
+        line_name = LineType.get_name(row['line_type_id'])
+        print(f"D{row['day']} {line_name}-{row['line_idx']} {shift_name}: "
               f"{row['product']}  T={row['run_hours']:.2f}h  U={row['units']:.1f}")
 
     print("\n--- Implied headcount need (per type/shift/day) ---")
     for row in headcount:
-        print(f"{row['emp_type']}, S{row['shift']}, D{row['day']}: "
+        shift_name = ShiftType.get_name(row['shift'])
+        print(f"{row['emp_type']}, {shift_name}, D{row['day']}: "
               f"need={row['needed']} (avail {row['available']})")
 
     print("\n--- Total person-hours by type/day ---")