Skip to content

Commit

Permalink
Merge pull request #43 from hotungkhanh/kan-85/page-loading
Browse files Browse the repository at this point in the history
Kan 85/page loading
  • Loading branch information
dh-giang-vu authored Oct 9, 2024
2 parents a5dcc82 + a5d4b6a commit 2b5453e
Show file tree
Hide file tree
Showing 11 changed files with 627 additions and 1,103 deletions.
8 changes: 4 additions & 4 deletions backend/src/main/java/org/acme/rest/TimetableResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ public Timetable solveExample() throws ExecutionException, InterruptedException
Student h = new Student("h");
Student i = new Student("i");

Room r1 = new Room("Room1", "Building1", "Campus1", 2, true);
Room r2 = new Room("Room2", "Building2", "Campus2", 4, false);
Room r3 = new Room("Room3", "Building3", "Campus3", 4, false);
Room r1 = new Room("Room1", "Building1", "Adelaide", 2, true);
Room r2 = new Room("Room2", "Building2", "Adelaide", 4, false);
Room r3 = new Room("Room3", "Building3", "Adelaide", 4, false);

Unit u1 = new Unit(1, "This", "Course A", Duration.ofHours(2), List.of(a, b), true);
Unit u2 = new Unit(2, "Is", "Course A", Duration.ofHours(2), List.of(a, c, d, e), true);
Unit u3 = new Unit(3, "A", "Course B", Duration.ofHours(2), List.of(f, g, h, i), false);
Unit u4 = new Unit(4, "Test", "Course C", Duration.ofHours(2), List.of(a, b), false);

var problem = new Timetable("Campus A",
var problem = new Timetable("Adelaide",
List.of(
u1, u2, u3, u4
// new Unit(5, "5", Duration.ofHours(2), List.of(c, d, e)),
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ quarkus.http.port=${PORT:8080}
# The solver runs only for 5 seconds to avoid a HTTP timeout in this simple implementation.
# It's recommended to run for at least 5 minutes ("5m") otherwise.

quarkus.timefold.solver.termination.spent-limit=30s
quarkus.timefold.solver.termination.spent-limit=15s

quarkus.http.cors=true
quarkus.http.cors.origins=*
Expand Down
Loading

0 comments on commit 2b5453e

Please sign in to comment.