Update app.py

app.py

@@ -2,28 +2,34 @@ import streamlit as st
 import pandas as pd
 from ortools.sat.python import cp_model
 
-# Initialize session state
+# Initialize session state to store timetable
 if "timetable" not in st.session_state:
     st.session_state.timetable = pd.DataFrame(columns=["Day", "Time", "Subject", "Teacher", "Room"])
-if "teachers" not in st.session_state:
-    st.session_state.teachers = []
-if "rooms" not in st.session_state:
-    st.session_state.rooms = []
-if "subjects" not in st.session_state:
-    st.session_state.subjects = {}
-if "availability" not in st.session_state:
-    st.session_state.availability = {}
 
 # App title
-st.title("Professional Timetable Generator")
+st.title("Subject Timetable Generator")
 
-# Sidebar inputs
+# Sidebar inputs to add data
 st.sidebar.header("Add Data")
 
+# Add subjects with weekly slots
+subject = st.sidebar.text_input("Enter Subject Name")
+weekly_slots = st.sidebar.number_input("Number of Weekly Slots", min_value=1, max_value=10, step=1)
+if st.sidebar.button("Add Subject"):
+    if subject and weekly_slots > 0:
+        if 'subjects' not in st.session_state:
+            st.session_state.subjects = {}
+        st.session_state.subjects[subject] = weekly_slots
+        st.success(f"Added Subject: {subject} with {weekly_slots} slots per week")
+    else:
+        st.error("Please provide a valid subject and weekly slots.")
+
 # Add teachers
 teacher = st.sidebar.text_input("Enter Teacher Name")
 if st.sidebar.button("Add Teacher"):
     if teacher:
+        if 'teachers' not in st.session_state:
+            st.session_state.teachers = []
         st.session_state.teachers.append(teacher)
         st.success(f"Added Teacher: {teacher}")
     else:
@@ -33,33 +39,25 @@ if st.sidebar.button("Add Teacher"):
 room = st.sidebar.text_input("Enter Room Name")
 if st.sidebar.button("Add Room"):
     if room:
+        if 'rooms' not in st.session_state:
+            st.session_state.rooms = []
         st.session_state.rooms.append(room)
         st.success(f"Added Room: {room}")
     else:
         st.error("Room name cannot be empty!")
 
-# Add subjects with weekly slots
-subject = st.sidebar.text_input("Enter Subject Name")
-slots = st.sidebar.number_input("Number of Weekly Slots", min_value=1, max_value=10, step=1)
-if st.sidebar.button("Add Subject"):
-    if subject and slots > 0:
-        st.session_state.subjects[subject] = slots
-        st.success(f"Added Subject: {subject} with {slots} slots per week")
-    else:
-        st.error("Subject name cannot be empty, and slots must be greater than 0!")
-
-# Show existing data
+# Show current data
 st.write("### Current Data")
+st.write("**Subjects:**", st.session_state.subjects)
 st.write("**Teachers:**", st.session_state.teachers)
 st.write("**Rooms:**", st.session_state.rooms)
-st.write("**Subjects and Weekly Slots:**", st.session_state.subjects)
 
-# Timetable generation logic with debugging
-def generate_timetable(teachers, subjects, rooms, time_slots, days):
+# Timetable generation logic
+def generate_timetable(subjects, teachers, rooms, time_slots, days):
     model = cp_model.CpModel()
     schedule = {}
 
-    # Variables for each subject-teacher-room-time-slot combination
+    # Create variables for each subject-teacher-room-time-slot combination
     for subject, slots in subjects.items():
         for teacher in teachers:
             for room in rooms:
@@ -69,7 +67,7 @@ def generate_timetable(teachers, subjects, rooms, time_slots, days):
                             f"{subject}_{teacher}_{room}_{day}_{time_slot}"
                         )
 
-    # Constraints: Each subject should have the required number of slots per week
+    # Constraints: Each subject should have the required number of weekly slots
     for subject, slots in subjects.items():
         model.Add(
             sum(
@@ -81,13 +79,33 @@ def generate_timetable(teachers, subjects, rooms, time_slots, days):
             ) == slots
         )
 
+    # Constraints: No teacher or room should be double-booked
+    for teacher in teachers:
+        for day in days:
+            for time_slot in time_slots:
+                model.Add(
+                    sum(
+                        schedule[(subject, teacher, room, day, time_slot)]
+                        for subject in subjects
+                        for room in rooms
+                    ) <= 1  # A teacher can only be in one class at a time
+                )
+
+    for room in rooms:
+        for day in days:
+            for time_slot in time_slots:
+                model.Add(
+                    sum(
+                        schedule[(subject, teacher, room, day, time_slot)]
+                        for subject in subjects
+                        for teacher in teachers
+                    ) <= 1  # A room can only be used for one subject at a time
+                )
+
     # Solve the model
     solver = cp_model.CpSolver()
     status = solver.Solve(model)
 
-    # Debugging: Print solver status
-    st.write("Solver Status:", status)
-
     if status == cp_model.OPTIMAL:
         result = []
         for key, var in schedule.items():
@@ -95,17 +113,19 @@ def generate_timetable(teachers, subjects, rooms, time_slots, days):
                 result.append(key)
         return result
     else:
-        st.write("No feasible solution found with the given constraints.")
         return []
 
+# Time slots and days for timetable
+time_slots = [f"{hour}:00 - {hour+1}:00" for hour in range(8, 18)]  # 8 AM to 6 PM
+days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]
+
 # Generate timetable button
 if st.button("Generate Timetable"):
-    time_slots = [f"{hour}:00 - {hour+1}:00" for hour in range(8, 18)]  # 8 AM to 6 PM
-    days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
     timetable = generate_timetable(
-        st.session_state.teachers, st.session_state.subjects, st.session_state.rooms, time_slots, days
+        st.session_state.subjects, st.session_state.teachers, st.session_state.rooms, time_slots, days
     )
     if timetable:
+        # Store the generated timetable
         for entry in timetable:
             subject, teacher, room, day, time_slot = entry
             st.session_state.timetable = pd.concat(
@@ -117,7 +137,7 @@ if st.button("Generate Timetable"):
     else:
         st.error("Failed to generate timetable. Check constraints!")
 
-# Display timetable
+# Display the generated timetable
 st.write("### Generated Timetable")
 if not st.session_state.timetable.empty:
     st.dataframe(st.session_state.timetable)
@@ -129,8 +149,3 @@ if not st.session_state.timetable.empty:
     )
 else:
     st.write("No timetable generated yet.")
-
-# Clear timetable
-if st.button("Clear Timetable"):
-    st.session_state.timetable = pd.DataFrame(columns=["Day", "Time", "Subject", "Teacher", "Room"])
-    st.success("Timetable cleared!")