Skip to content

Added example files and minor updates #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RandomCyberCoder merged 5 commits into from
May 5, 2026
Merged

Added example files and minor updates #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7119dcf
example files for input
RandomCyberCoder May 5, 2026
96924a5
real and example input files given
RandomCyberCoder May 5, 2026
98e510f
other file examples and small tweaks
RandomCyberCoder May 5, 2026
e5ebc40
update comments and backend entry point
RandomCyberCoder May 5, 2026
ea36ace
config update to speed up solver
RandomCyberCoder May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generated/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Generated solutions should go here
Generated solutions should be place here and the file dump with the json representation of when instructors were
scheduled this quarter
71 changes: 71 additions & 0 deletions generated/scheduled_times_dump.example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"LastName, FirstName": [
{
"start": "10:00AM",
"day": "MONDAY",
"end": "12:00PM"
},
{
"start": "10:00AM",
"day": "WEDNESDAY",
"end": "12:00PM"
},
{
"start": "10:00AM",
"day": "FRIDAY",
"end": "12:00PM"
},
{
"start": "4:00PM",
"day": "MONDAY",
"end": "6:00PM"
},
{
"start": "4:00PM",
"day": "WEDNESDAY",
"end": "6:00PM"
},
{
"start": "4:00PM",
"day": "FRIDAY",
"end": "6:00PM"
},
{
"start": "12:00PM",
"day": "MONDAY",
"end": "2:00PM"
},
{
"start": "12:00PM",
"day": "WEDNESDAY",
"end": "2:00PM"
},
{
"start": "12:00PM",
"day": "FRIDAY",
"end": "2:00PM"
}
],
"LastName2, FirstName2": [
{
"start": "9:00AM",
"day": "MONDAY",
"end": "10:30AM"
},
{
"start": "9:00AM",
"day": "WEDNESDAY",
"end": "10:30AM"
},
{
"start": "11:00AM",
"day": "MONDAY",
"end": "1:00PM"
},
{
"start": "11:00AM",
"day": "WEDNESDAY",
"end": "1:00PM"
}
]
}
Binary file added generated/term_department_solution.xlsx
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion java/hello-world/src/main/java/org/acme/schooltimetabling/TimetableApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.util.*;

public class TimetableApp {
//TODO andrea schuman name udpate in excel file, update in the db as well or at least check over this
private static final Logger LOGGER = LoggerFactory.getLogger(TimetableApp.class);
private static final String YAML_FILE_PATH = "constants/config.yaml";
private static final boolean PRINT_DETAILED_SUMMARY = true;
Expand Down
2 changes: 1 addition & 1 deletion java/hello-world/src/main/java/org/acme/schooltimetabling/apiCalls/ApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import retrofit2.converter.gson.GsonConverterFactory;

public class ApiConstants {
public final static String baseUrl = "http://localhost:8000/api/";
public final static String baseUrl = "http://localhost:8002/api/";
public final static Retrofit retrofit = new Retrofit.Builder()
.baseUrl(ApiConstants.baseUrl)
.client(new OkHttpClient.Builder().build())
Expand Down
3 changes: 1 addition & 2 deletions java/hello-world/src/main/java/org/acme/schooltimetabling/constants/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ public class Constants {
List<String> introCourses = List.of("csc1001", "csc2002", "csc2050");
Set<String> introRooms = Set.of("Room 301", "Room 302", "Room 232A");

//TODO non_sec_courses
List<String> non_sec_courses = List.of("csc2050", "csc3300");
Set<String> non_sec_rooms = Set.of("Room 301", "Room 302", "Room 232A", "Room 255", "Room 256", "Room 257",
"Room 20-127");
Expand Down Expand Up @@ -247,7 +246,7 @@ public class Constants {

FACULTY_LAST_NAMES = ParseInput.getFaculty("constants/faculty_website_list.tsv");

TEACHER_NAME_TO_CANON = getInstructorNameMapping("constants/faculty_names_new.xlsx");
TEACHER_NAME_TO_CANON = getInstructorNameMapping("constants/name_mappings.xlsx");
}

private Constants(){
Expand Down
1 change: 0 additions & 1 deletion java/hello-world/src/main/java/org/acme/schooltimetabling/helperClasses/BitSetHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public static BitSet timeSlotBitSet(LocalTime startTime, int numberOfBlocks, Enu
/* Each hour has two 30-minute blocks*/
final int HOUR_OFFSET = 2;
BitSet bitSet = new BitSet();
//TODO so it's not so wierd of mapping values. Do math such as hour-7 and multiply by 2 to get offset
int startHour = startTime.getHour();
if(startHour < FIRST_POSSIBLE_HR || startHour > LST_POSSIBLE_HR) throw new RuntimeException(String.format(
"There was an error reading the time '%s'", startTime));
Expand Down
12 changes: 10 additions & 2 deletions ...d/src/main/java/org/acme/schooltimetabling/helperClasses/Generators/TeacherGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,22 @@ private static Teacher generateTeacher(HashMap<String, String> surveyEntry){
return new Teacher(getNextTeacherID(), canonName, preferred, acceptable, conflicts, pref);
}

//TODO note to update the teachers that get made on the fly if their teacher object is not found

private static void prescheduleUpdate(Map<String, Teacher> teacherMap, Map<String, List<Map<String, String>>> presched){
Iterator<Map.Entry<String, List<Map<String, String>>>> iterator = presched.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, List<Map<String, String>>> entry = iterator.next();
String name = entry.getKey();
Teacher teacher = teacherMap.get(name);
if (teacher == null) continue;
if (teacher == null){
teacher = new Teacher(getNextTeacherID(), name, new BitSet(), new BitSet(), new BitSet());
LOGGER.warn("Couldn't find a teacher object for {} during prescheduling setup; creating one...", name);
if(Constants.FACULTY_LAST_NAMES.contains(name.split(",")[0].strip())){
LOGGER.info("promoting {} to faculty", name);
teacher = new Faculty(teacher);
}
teacherMap.put(name, teacher);
}

try {
BitSet addConflict = createPreschedBs(entry.getValue());
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/acme/schooltimetabling/helperClasses/Generators/TimeslotGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Optional;
//TODO MAKE SURE THE THAT TIMESLOTS BEING GENERATED DON'T TAKE INTO ACCOUNT THE ENDING LIKE IF IT ENDS AT 11:00AM THAT THE 11AM ISN'T MARKED FOR THE LEC OR LAB/ACT BIT

public class TimeslotGenerator extends Generator{
private final static Logger LOGGER = LoggerFactory.getLogger(TimeslotGenerator.class);

Expand Down
2 changes: 2 additions & 0 deletions java/hello-world/src/main/resources/.example.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
API_PASSWORD="userPassword"
API_USER="userName"
12 changes: 12 additions & 0 deletions java/hello-world/src/main/resources/constants/config.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
department: "csc"
curTerm: "2268"
prevTerm: "2264"
seasonTerm: "fall"
testing: false
useApi: true
# ------- Optional -------
# this setting changes how we model the PrimeTime constraint
aggressiveChoice: "AGGRESSIVE_PENALTY"
compressStart: "7:00AM"
compressEnd: "6:00PM"
prescheduledFileName: "PrescheduledTimes_ExampleFile.example.json"
171 changes: 171 additions & 0 deletions java/hello-world/src/main/resources/constants/possibleTimes.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
days, time_start, time_end, lecture_hours, total_hours, lab_days, lab_start, lab_end, lab_hours
MWF, 7:00AM, 9:00AM, 1, 2,,,,
MWF, 8:00AM, 10:00AM, 1, 2,,,,
MWF, 9:00AM, 11:00AM, 1, 2,,,,
MWF, 10:00AM, 12:00PM, 1, 2,,,,
MWF, 11:00AM, 1:00PM, 1, 2,,,,
MWF, 12:00PM, 2:00PM, 1, 2,,,,
MWF, 1:00PM, 3:00PM, 1, 2,,,,
MWF, 2:00PM, 4:00PM, 1, 2,,,,
MWF, 3:00PM, 5:00PM, 1, 2,,,,
MWF, 4:00PM, 6:00PM, 1, 2,,,,
MWF, 5:00PM, 7:00PM, 1, 2,,,,
MWF, 6:00PM, 8:00PM, 1, 2,,,,
MWF, 7:00AM, 8:00AM, 1, 1,,,,
MWF, 8:00AM, 9:00AM, 1, 1,,,,
MWF, 9:00AM, 10:00AM, 1, 1,,,,
MWF, 10:00AM, 11:00AM, 1, 1,,,,
MWF, 12:00PM, 1:00PM, 1, 1,,,,
MWF, 1:00PM, 2:00PM, 1, 1,,,,
MWF, 2:00PM, 3:00PM, 1, 1,,,,
MWF, 3:00PM, 4:00PM, 1, 1,,,,
MWF, 4:00PM, 5:00PM, 1, 1,,,,
MWF, 5:00PM, 6:00PM, 1, 1,,,,
MWF, 6:00PM, 7:00PM, 1, 1,,,,
MWF, 7:00PM, 8:00PM, 1, 1,,,,
MWF, 8:00PM, 9:00PM, 1, 1,,,,
MTWR, 7:00AM, 8:00AM, 1, 1,,,,
MTWR, 8:00AM, 9:00AM, 1, 1,,,,
MTWR, 9:00AM, 10:00AM, 1, 1,,,,
MTWR, 10:00AM, 11:00AM, 1, 1,,,,
MTWR, 11:00AM, 12:00PM, 1, 1,,,,
MTWR, 12:00PM, 1:00PM, 1, 1,,,,
MTWR, 1:00PM, 2:00PM, 1, 1,,,,
MTWR, 2:00PM, 3:00PM, 1, 1,,,,
MTWR, 3:00PM, 4:00PM, 1, 1,,,,
MTWR, 4:00PM, 5:00PM, 1, 1,,,,
MTWR, 5:00PM, 6:00PM, 1, 1,,,,
MTWR, 6:00PM, 7:00PM, 1, 1,,,,
MTWR, 7:00PM, 8:00PM, 1, 1,,,,
MTWR, 8:00PM, 9:00PM, 1, 1,,,,
MW, 7:00AM, 8:00AM, 1, 1, MW, 8:00AM, 9:00AM, 1
MW, 8:00AM, 9:00AM, 1, 1, MW, 9:00AM, 10:00AM, 1
MW, 9:00AM, 10:00AM, 1, 1, MW, 10:00AM, 11:00AM, 1
MW, 10:00AM, 11:00AM, 1, 1, MW, 11:00AM, 12:00PM, 1
MW, 11:00AM, 12:00PM, 1, 1, MW, 12:00PM, 1:00PM, 1
MW, 12:00PM, 1:00PM, 1, 1, MW, 1:00PM, 2:00PM, 1
MW, 1:00PM, 2:00PM, 1, 1, MW, 2:00PM, 3:00PM, 1
MW, 2:00PM, 3:00PM, 1, 1, MW, 3:00PM, 4:00PM, 1
MW, 3:00PM, 4:00PM, 1, 1, MW, 4:00PM, 5:00PM, 1
MW, 4:00PM, 5:00PM, 1, 1, MW, 5:00PM, 6:00PM, 1
MW, 5:00PM, 6:00PM, 1, 1, MW, 6:00PM, 7:00PM, 1
MW, 6:00PM, 7:00PM, 1, 1, MW, 7:00PM, 8:00PM, 1
MW, 7:00PM, 8:00PM, 1, 1, MW, 8:00PM, 9:00PM, 1
TR, 7:00AM, 8:00AM, 1, 1, TR, 8:00AM, 9:00AM, 1
TR, 8:00AM, 9:00AM, 1, 1, TR, 9:00AM, 10:00AM, 1
TR, 9:00AM, 10:00AM, 1, 1, TR, 10:00AM, 11:00AM, 1
TR, 10:00AM, 11:00AM, 1, 1, TR, 11:00AM, 12:00PM, 1
TR, 11:00AM, 12:00PM, 1, 1, TR, 12:00PM, 1:00PM, 1
TR, 12:00PM, 1:00PM, 1, 1, TR, 1:00PM, 2:00PM, 1
TR, 1:00PM, 2:00PM, 1, 1, TR, 2:00PM, 3:00PM, 1
TR, 2:00PM, 3:00PM, 1, 1, TR, 3:00PM, 4:00PM, 1
TR, 3:00PM, 4:00PM, 1, 1, TR, 4:00PM, 5:00PM, 1
TR, 4:00PM, 5:00PM, 1, 1, TR, 5:00PM, 6:00PM, 1
TR, 5:00PM, 6:00PM, 1, 1, TR, 6:00PM, 7:00PM, 1
TR, 6:00PM, 7:00PM, 1, 1, TR, 7:00PM, 8:00PM, 1
TR, 7:00PM, 8:00PM, 1, 1, TR, 8:00PM, 9:00PM, 1
WF, 7:00AM, 8:00AM, 1, 1, WF, 8:00AM, 9:00AM, 1
WF, 8:00AM, 9:00AM, 1, 1, WF, 9:00AM, 10:00AM, 1
WF, 9:00AM, 10:00AM, 1, 1, WF, 10:00AM, 11:00AM, 1
WF, 10:00AM, 11:00AM, 1, 1, WF, 11:00AM, 12:00PM, 1
WF, 12:00PM, 1:00PM, 1, 1, WF, 1:00PM, 2:00PM, 1
WF, 1:00PM, 2:00PM, 1, 1, WF, 2:00PM, 3:00PM, 1
WF, 2:00PM, 3:00PM, 1, 1, WF, 3:00PM, 4:00PM, 1
WF, 3:00PM, 4:00PM, 1, 1, WF, 4:00PM, 5:00PM, 1
WF, 4:00PM, 5:00PM, 1, 1, WF, 5:00PM, 6:00PM, 1
WF, 5:00PM, 6:00PM, 1, 1, WF, 6:00PM, 7:00PM, 1
WF, 6:00PM, 7:00PM, 1, 1, WF, 7:00PM, 8:00PM, 1
WF, 7:00PM, 8:00PM, 1, 1, WF, 8:00PM, 9:00PM, 1
MW, 7:30AM, 9:00AM, 1.5, 1.5, MW, 9:00AM, 10:30AM, 1.5
MW, 9:00AM, 10:30AM, 1.5, 1.5, MW, 10:30AM, 12:00PM, 1.5
MW, 10:30AM, 12:00PM, 1.5, 1.5, MW, 12:00PM, 1:30PM, 1.5
MW, 12:00PM, 1:30PM, 1.5, 1.5, MW, 1:30PM, 3:00PM, 1.5
MW, 1:30PM, 3:00PM, 1.5, 1.5, MW, 3:00PM, 4:30PM, 1.5
MW, 3:00PM, 4:30PM, 1.5, 1.5, MW, 4:30PM, 6:00PM, 1.5
MW, 4:30PM, 6:00PM, 1.5, 1.5, MW, 6:00PM, 7:30PM, 1.5
MW, 6:00PM, 7:30PM, 1.5, 1.5, MW, 7:30PM, 9:00PM, 1.5
TR, 7:30AM, 9:00AM, 1.5, 1.5, TR, 9:00AM, 10:30AM, 1.5
TR, 9:00AM, 10:30AM, 1.5, 1.5, TR, 10:30AM, 12:00PM, 1.5
TR, 10:30AM, 12:00PM, 1.5, 1.5, TR, 12:00PM, 1:30PM, 1.5
TR, 12:00PM, 1:30PM, 1.5, 1.5, TR, 1:30PM, 3:00PM, 1.5
TR, 1:30PM, 3:00PM, 1.5, 1.5, TR, 3:00PM, 4:30PM, 1.5
TR, 3:00PM, 4:30PM, 1.5, 1.5, TR, 4:30PM, 6:00PM, 1.5
TR, 4:30PM, 6:00PM, 1.5, 1.5, TR, 6:00PM, 7:30PM, 1.5
TR, 6:00PM, 7:30PM, 1.5, 1.5, TR, 7:30PM, 9:00PM, 1.5
WF, 7:30AM, 9:00AM, 1.5, 1.5, WF, 9:00AM, 10:30AM, 1.5
WF, 9:00AM, 10:30AM, 1.5, 1.5, WF, 10:30AM, 12:00PM, 1.5
WF, 12:00PM, 1:30PM, 1.5, 1.5, WF, 1:30PM, 3:00PM, 1.5
WF, 1:30PM, 3:00PM, 1.5, 1.5, WF, 3:00PM, 4:30PM, 1.5
WF, 3:00PM, 4:30PM, 1.5, 1.5, WF, 4:30PM, 6:00PM, 1.5
WF, 4:30PM, 6:00PM, 1.5, 1.5, WF, 6:00PM, 7:30PM, 1.5
WF, 6:00PM, 7:30PM, 1.5, 1.5, WF, 7:30PM, 9:00PM, 1.5
F, 7:00AM, 8:00AM, 1, 1,,,,
F, 8:00AM, 9:00AM, 1, 1,,,,
F, 9:00AM, 10:00AM, 1, 1,,,,
F, 10:00AM, 11:00AM, 1, 1,,,,
F, 12:00PM, 1:00PM, 1, 1,,,,
F, 1:00PM, 2:00PM, 1, 1,,,,
F, 2:00PM, 3:00PM, 1, 1,,,,
F, 3:00PM, 4:00PM, 1, 1,,,,
F, 4:00PM, 5:00PM, 1, 1,,,,
F, 5:00PM, 6:00PM, 1, 1,,,,
F, 6:00PM, 7:00PM, 1, 1,,,,
F, 7:00PM, 8:00PM, 1, 1,,,,
F, 8:00PM, 9:00PM, 1, 1,,,,
R, 7:00AM, 8:00AM, 1, 1,,,,
R, 8:00AM, 9:00AM, 1, 1,,,,
R, 9:00AM, 10:00AM, 1, 1,,,,
R, 10:00AM, 11:00AM, 1, 1,,,,
R, 11:00AM, 12:00PM, 1, 1,,,,
R, 12:00PM, 1:00PM, 1, 1,,,,
R, 1:00PM, 2:00PM, 1, 1,,,,
R, 2:00PM, 3:00PM, 1, 1,,,,
R, 3:00PM, 4:00PM, 1, 1,,,,
R, 4:00PM, 5:00PM, 1, 1,,,,
R, 5:00PM, 6:00PM, 1, 1,,,,
R, 6:00PM, 7:00PM, 1, 1,,,,
R, 7:00PM, 8:00PM, 1, 1,,,,
R, 8:00PM, 9:00PM, 1, 1,,,,
MW, 8:00AM, 10:00AM, 2, 2,,,,
MW, 10:00AM, 12:00PM, 2, 2,,,,
MW, 12:00PM, 2:00PM, 2, 2,,,,
MW, 2:00PM, 4:00PM, 2, 2,,,,
MW, 4:00PM, 6:00PM, 2, 2,,,,
MW, 6:00PM, 8:00PM, 2, 2,,,,
WF, 8:00AM, 10:00AM, 2, 2,,,,
WF, 12:00PM, 2:00PM, 2, 2,,,,
WF, 2:00PM, 4:00PM, 2, 2,,,,
WF, 4:00PM, 6:00PM, 2, 2,,,,
WF, 6:00PM, 8:00PM, 2, 2,,,,
TR, 8:00AM, 10:00AM, 2, 2,,,,
TR, 10:00AM, 12:00PM, 2, 2,,,,
TR, 12:00PM, 2:00PM, 2, 2,,,,
TR, 2:00PM, 4:00PM, 2, 2,,,,
TR, 4:00PM, 6:00PM, 2, 2,,,,
TR, 6:00PM, 8:00PM, 2, 2,,,,
MW, 7:30AM, 9:00AM, 1.5, 1.5,,,,
MW, 9:00AM, 10:30AM, 1.5, 1.5,,,,
MW, 10:30AM, 12:00PM, 1.5, 1.5,,,,
MW, 12:00PM, 1:30PM, 1.5, 1.5,,,,
MW, 1:30PM, 3:00PM, 1.5, 1.5,,,,
MW, 3:00PM, 4:30PM, 1.5, 1.5,,,,
MW, 4:30PM, 6:00PM, 1.5, 1.5,,,,
MW, 6:00PM, 7:30PM, 1.5, 1.5,,,,
MW, 7:30PM, 9:00PM, 1.5, 1.5,,,,
WF, 7:30AM, 9:00AM, 1.5, 1.5,,,,
WF, 9:00AM, 10:30AM, 1.5, 1.5,,,,
WF, 12:00PM, 1:30PM, 1.5, 1.5,,,,
WF, 1:30PM, 3:00PM, 1.5, 1.5,,,,
WF, 3:00PM, 4:30PM, 1.5, 1.5,,,,
WF, 4:30PM, 6:00PM, 1.5, 1.5,,,,
WF, 6:00PM, 7:30PM, 1.5, 1.5,,,,
WF, 7:30PM, 9:00PM, 1.5, 1.5,,,,
TR, 7:30AM, 9:00AM, 1.5, 1.5,,,,
TR, 9:00AM, 10:30AM, 1.5, 1.5,,,,
TR, 10:30AM, 12:00PM, 1.5, 1.5,,,,
TR, 12:00PM, 1:30PM, 1.5, 1.5,,,,
TR, 1:30PM, 3:00PM, 1.5, 1.5,,,,
TR, 3:00PM, 4:30PM, 1.5, 1.5,,,,
TR, 4:30PM, 6:00PM, 1.5, 1.5,,,,
TR, 6:00PM, 7:30PM, 1.5, 1.5,,,,
TR, 7:30PM, 9:00PM, 1.5, 1.5,,,,
Loading
Loading