Skip to content
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.

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

[T11-1] Efficient Learning Scheduler #20

Open
wants to merge 428 commits into
base: master
Choose a base branch
from
Open
Changes from 12 commits
Commits
Show all changes
428 commits
Select commit Hold shift + click to select a range
145fe9e
Merge pull request #4 from CS2113-AY1819S2-T11-1/master
windrichie Mar 31, 2019
e2d8547
Fixed Travis checkstyle erorrs - Attempt #1
windrichie Mar 31, 2019
45d14c1
Merge branch 'master' of https://github.com/windrichie/main
windrichie Mar 31, 2019
936d748
Fixed Travis error - updated AddCommandTest
windrichie Mar 31, 2019
9cc9648
Added comment for Regex expressions
windrichie Apr 1, 2019
ccc0329
Fixed Travis checkstyle error
windrichie Apr 1, 2019
66bc850
Merge pull request #60 from windrichie/master
Sameow Apr 1, 2019
8cf87c4
Basic structure up in place
Sameow Apr 1, 2019
161ae95
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 1, 2019
65f2534
Fixed travis error
Sameow Apr 1, 2019
2a85300
Merge pull request #61 from Sameow/master
Sameow Apr 1, 2019
c995237
Merge pull request #5 from CS2113-AY1819S2-T11-1/master
windrichie Apr 1, 2019
82d29d6
updated UserGuide and fixed some bug with my list event command.
windrichie Apr 1, 2019
0fc6e40
fixed travis checkstyle
windrichie Apr 1, 2019
6e4d98f
fixed checkstyle
windrichie Apr 1, 2019
d34185a
fixed erro
windrichie Apr 1, 2019
636ed3d
Added activities class
JKupoluyi Apr 1, 2019
45ecf5f
Made Activities class
JKupoluyi Apr 1, 2019
62f06b3
Merge branch 'master' into master
JKupoluyi Apr 1, 2019
0f72428
Merge pull request #63 from windrichie/master
windrichie Apr 1, 2019
1cc19af
Merge branch 'master' into master
JKupoluyi Apr 1, 2019
60f65b1
updated version
windrichie Apr 1, 2019
8eb284a
Update Activities.java
JKupoluyi Apr 1, 2019
39590c3
Merge branch 'master' into master
Sameow Apr 1, 2019
6f1b711
Merge pull request #64 from JKupoluyi/master
Sameow Apr 1, 2019
c0a2a25
Merge branch 'master' into master
Sameow Apr 1, 2019
a709105
Merge pull request #65 from windrichie/master
windrichie Apr 1, 2019
3f14aa9
some progress
Sameow Apr 1, 2019
d826202
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 1, 2019
a438e9d
Added an AddActivityCommand class, CheckAvailability Class, Day and A…
JKupoluyi Apr 1, 2019
fb45438
Merge branch 'master' of https://github.com/JKupoluyi/main
JKupoluyi Apr 1, 2019
bed9eb3
Initialized a timetable for every initialization of a person
JKupoluyi Apr 1, 2019
427b22d
preparing PPP
Sameow Apr 2, 2019
2ecf9b9
Fixed Travis errors
Sameow Apr 2, 2019
200439b
avoid testing for now
Sameow Apr 2, 2019
b241dab
updated testcase for interleave feature
Sameow Apr 2, 2019
9cb0ee5
Merge pull request #4 from CS2113-AY1819S2-T11-1/master
JKupoluyi Apr 2, 2019
9a7dcf5
added the addActivity command to the user guide
JKupoluyi Apr 2, 2019
bf6b663
Merge pull request #68 from Sameow/master
windrichie Apr 2, 2019
45ddd69
Merge pull request #6 from CS2113-AY1819S2-T11-1/master
windrichie Apr 2, 2019
d48bf62
PPP final touches
Sameow Apr 2, 2019
948c67f
Added my portfolio
JKupoluyi Apr 2, 2019
47670b6
Merge branch 'master' into master
JKupoluyi Apr 2, 2019
5c5d36f
Changed Project Portfolio
JKupoluyi Apr 2, 2019
fcab2aa
Merge branch 'master' of https://github.com/JKupoluyi/main
JKupoluyi Apr 2, 2019
9b4a4df
Merge pull request #69 from JKupoluyi/master
Sameow Apr 2, 2019
1373d73
Merge pull request #7 from CS2113-AY1819S2-T11-1/master
windrichie Apr 2, 2019
dc7bb7b
updated project portfolio page
windrichie Apr 2, 2019
212be06
Merge branch 'master' of https://github.com/windrichie/main
windrichie Apr 2, 2019
38790d2
changed some stuff in my project portfolio page
windrichie Apr 2, 2019
04545a8
Made more Changes to my portfolio
JKupoluyi Apr 2, 2019
35c6024
fixed checkstyle error
windrichie Apr 2, 2019
4e8d1ce
Merge branch 'master' into master
Sameow Apr 2, 2019
2be0a96
Merge pull request #71 from JKupoluyi/master
windrichie Apr 2, 2019
9503984
Merge branch 'master' into master
windrichie Apr 2, 2019
d194133
Merge pull request #70 from windrichie/master
windrichie Apr 2, 2019
5ce1c9e
Added an addActivity command.
JKupoluyi Apr 3, 2019
9c5f1b4
Updated the add activity command.
JKupoluyi Apr 3, 2019
4aa38ee
Merge branch 'master' of https://github.com/JKupoluyi/main
JKupoluyi Apr 3, 2019
66066c5
some base code to sync with Layomi's implementation
Sameow Apr 3, 2019
33a736a
Merge branch 'master' into master
JKupoluyi Apr 3, 2019
a2094be
no newline at EOF.
Sameow Apr 4, 2019
734175a
trailing whitespace.
Sameow Apr 4, 2019
f82d2bd
Indicated missing Javadoc comments
Sameow Apr 4, 2019
104728d
Added a list Modules class
JKupoluyi Apr 5, 2019
2da747f
Fixed conflicts and add a list module class.
JKupoluyi Apr 5, 2019
2a16ba3
fixed merge conflict
JKupoluyi Apr 5, 2019
8a3fc6a
Update AddActivityCommand.java
JKupoluyi Apr 5, 2019
6cf9e7f
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
de1069a
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
a3fe1b3
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
d4e482b
Update AddActivityCommandParser.java
JKupoluyi Apr 5, 2019
5d39c46
Update CheckAvailabilityCommandParser.java
JKupoluyi Apr 5, 2019
c7bb213
Update ParserUtil.java
JKupoluyi Apr 5, 2019
c7a57ba
Update ParserUtil.java
JKupoluyi Apr 5, 2019
cf0c753
Update Person.java
JKupoluyi Apr 5, 2019
2dbaf5e
Update Activity.java
JKupoluyi Apr 5, 2019
504e1cc
Update Activity.java
JKupoluyi Apr 5, 2019
df6d28a
Update Day.java
JKupoluyi Apr 5, 2019
debc1b9
Update StartTime.java
JKupoluyi Apr 5, 2019
0952d63
Update TimeTable.java
JKupoluyi Apr 5, 2019
968cc71
Update JsonAdaptedPerson.java
JKupoluyi Apr 5, 2019
f2cf0bb
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
b96cd03
changed the Timetable and Modules package names.
JKupoluyi Apr 5, 2019
27d1078
Merge branch 'master' of https://github.com/JKupoluyi/main
JKupoluyi Apr 5, 2019
df30a19
Update Person.java
JKupoluyi Apr 5, 2019
c30b53e
Update TimeTable.java
JKupoluyi Apr 5, 2019
0d2a38c
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
772cfd5
Update EditCommand.java
JKupoluyi Apr 5, 2019
6a41272
Update Person.java
JKupoluyi Apr 5, 2019
216f0ba
Update ModuleList.java
JKupoluyi Apr 5, 2019
1b3e9e7
Update Activity.java
JKupoluyi Apr 5, 2019
7c26102
Update Day.java
JKupoluyi Apr 5, 2019
ae08fdd
Update StartTime.java
JKupoluyi Apr 5, 2019
f196c62
Update SampleDataUtil.java
JKupoluyi Apr 5, 2019
ec2cb9a
Update JsonAdaptedPerson.java
JKupoluyi Apr 5, 2019
75f994d
Update Person.java
JKupoluyi Apr 5, 2019
d159307
Update Activity.java
JKupoluyi Apr 5, 2019
65cdd70
Update Day.java
JKupoluyi Apr 5, 2019
9da7a9e
Update StartTime.java
JKupoluyi Apr 5, 2019
950b19d
changed interleaver variables to final variables.
JKupoluyi Apr 5, 2019
223b196
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
c34a420
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
f989ee9
Update EditCommand.java
JKupoluyi Apr 5, 2019
9519b9f
Update AddCommandParser.java
JKupoluyi Apr 5, 2019
8af2250
Update Person.java
JKupoluyi Apr 5, 2019
2673c0a
Update ModuleList.java
JKupoluyi Apr 5, 2019
090a0f8
Update Activity.java
JKupoluyi Apr 5, 2019
9052f37
Update SampleDataUtil.java
JKupoluyi Apr 5, 2019
46e7f80
Update JsonAdaptedPerson.java
JKupoluyi Apr 5, 2019
0ecdaf7
Update Activity.java
JKupoluyi Apr 5, 2019
c923ed3
Update CheckAvailabilityCommand.java
JKupoluyi Apr 5, 2019
5611beb
Update ModuleList.java
JKupoluyi Apr 5, 2019
f7bfcbd
Update ModuleList.java
JKupoluyi Apr 5, 2019
f233e07
Update JsonAdaptedPersonTest.java
JKupoluyi Apr 5, 2019
4fdf209
Update EditPersonDescriptorBuilder.java
JKupoluyi Apr 5, 2019
6ae73ad
Update PersonBuilder.java
JKupoluyi Apr 5, 2019
57d120b
Update CommandBoxTest.java
JKupoluyi Apr 5, 2019
1512937
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
708545c
Update PersonListPanelTest.java
JKupoluyi Apr 5, 2019
b3ed642
Update JsonAdaptedPersonTest.java
JKupoluyi Apr 5, 2019
4fa9b35
Update CommandBoxTest.java
JKupoluyi Apr 5, 2019
b2ba4b9
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
0a8f9f5
Update JsonAdaptedPersonTest.java
JKupoluyi Apr 5, 2019
3fc4dde
Update CommandBoxTest.java
JKupoluyi Apr 5, 2019
cd5642f
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
3fe2a40
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
117d920
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
e60a1d7
Update CommandBoxTest.java
JKupoluyi Apr 5, 2019
9637f09
Update MainWindowCloseTest.java
JKupoluyi Apr 5, 2019
872ee0f
Update EditCommandParser.java
JKupoluyi Apr 6, 2019
3aa929f
Update MainWindowCloseTest.java
JKupoluyi Apr 6, 2019
c21cbf4
Update HelpCommandSystemTest.java
JKupoluyi Apr 6, 2019
1d0a3ca
Merge pull request #72 from JKupoluyi/master
Sameow Apr 6, 2019
feee350
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 6, 2019
c42895a
Making use of edit command to implement interleaving
Sameow Apr 7, 2019
3f34e24
finally ready to code interleave?
Sameow Apr 7, 2019
83b1dca
code to make use of existing generic editing methods
Sameow Apr 7, 2019
57c8fba
added interleave command usage
Sameow Apr 8, 2019
b325673
Some refactoring and working on interleaving
Sameow Apr 8, 2019
ab34491
Merge pull request #8 from CS2113-AY1819S2-T11-1/master
windrichie Apr 9, 2019
28460de
End of day save
Sameow Apr 9, 2019
29f1538
Done interleaving
Sameow Apr 10, 2019
337e293
Finished interleaving. Now updating other classes
Sameow Apr 10, 2019
47f1cbb
End of day save
Sameow Apr 11, 2019
85b4688
Finally done with all the tests
Sameow Apr 12, 2019
13c3d34
Fix travis errors
Sameow Apr 12, 2019
849c8cb
Fix travis errors
Sameow Apr 12, 2019
6843abb
Removed useless method
Sameow Apr 12, 2019
4b32978
Fix travis errors
Sameow Apr 12, 2019
c66a2ce
Removed useless method
Sameow Apr 12, 2019
3bdb652
Merge branch 'master' of https://github.com/Sameow/main
Sameow Apr 12, 2019
31898e8
Removing useless method again -_-
Sameow Apr 12, 2019
b1c50c8
Fix travis line too long error
Sameow Apr 12, 2019
34533e3
Line too long
Sameow Apr 12, 2019
d9b3502
Removed unused import
Sameow Apr 12, 2019
8cab651
Removed unused import
Sameow Apr 12, 2019
6ffeeb4
Removed unused import
Sameow Apr 12, 2019
9d8de38
Passed execute_duplicatePersonUnfilteredList_failure testcase. Found …
Sameow Apr 12, 2019
1144bb7
- changed project portoflio name to windrichie.adoc
windrichie Apr 12, 2019
f18655a
added FilterEventCommand to show events on a specific date
windrichie Apr 12, 2019
b3a7c19
End of day save
Sameow Apr 12, 2019
74aebe1
sort events by timing so that when filterevent is called, the events …
windrichie Apr 12, 2019
ce8c031
same as previous commit
windrichie Apr 12, 2019
53a661f
ALMOST THRE
Sameow Apr 13, 2019
8266502
No idea why this test is failing. Every piece of data seems to be sam…
Sameow Apr 13, 2019
668f218
updated EventTimeComparator to sort by date before sorting by time
windrichie Apr 13, 2019
89b1faf
no idea why parse_allFieldsPresent_success() doesnt work too...
Sameow Apr 13, 2019
3604655
Same problem. Objects to be tested are the same but somehow different
Sameow Apr 13, 2019
40a28ac
created all necessary classes for the UI part of timetable / activity
windrichie Apr 13, 2019
3275c14
successfully added functions and classes to display activity list on …
windrichie Apr 13, 2019
5754866
enable listactivity + index to show timetables of different people in…
windrichie Apr 13, 2019
5dd3e89
added check mechanism for listactivity command to make sure index is …
windrichie Apr 13, 2019
536b211
fixed Travis checkstyle error - Attempt #1
windrichie Apr 13, 2019
f72b52a
fixed JUnit Test errors
windrichie Apr 13, 2019
100a55d
fixed Travis checkstyle errors - Attempt #2
windrichie Apr 13, 2019
d4e3f1b
Merge pull request #83 from windrichie/master
windrichie Apr 13, 2019
8f069e7
parse_missingParts_failure() PASSED
Sameow Apr 13, 2019
717b66c
Merge pull request #6 from CS2113-AY1819S2-T11-1/master
JKupoluyi Apr 13, 2019
4d8908c
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 13, 2019
e02f3c8
fixed a bug in the listactivity command. it couldn't detect the chang…
windrichie Apr 13, 2019
b3db717
Trying to solve readAndSaveAddressBook_allInOrder_success
Sameow Apr 13, 2019
1f3fd33
added EventCheckAvailabilityCommand to check if a person can attend a…
windrichie Apr 13, 2019
3a8233b
Merge pull request #9 from CS2113-AY1819S2-T11-1/master
windrichie Apr 13, 2019
6e747f6
Fixed Travis checkstyle errors - attempt #1
windrichie Apr 14, 2019
1694359
solved readAndSaveAddressBook_allInOrder_success
Sameow Apr 14, 2019
b8b830d
fixed Travis checkstyle error - attempt #2
windrichie Apr 14, 2019
1224d2d
Fixed Travis
Sameow Apr 14, 2019
3f67e28
Fixed Travis
Sameow Apr 14, 2019
4f13b4f
Merge pull request #85 from windrichie/master
Sameow Apr 14, 2019
d2a1522
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 14, 2019
bad6961
Merge branch 'master' of https://github.com/Sameow/main
Sameow Apr 14, 2019
0cc96d6
Solved 2 testcases YYYAAAAYYYY
Sameow Apr 14, 2019
e0c3e74
Another testcase gone
Sameow Apr 14, 2019
12236eb
Merge pull request #80 from Sameow/master
windrichie Apr 14, 2019
cfd9d63
added 2 test classes - DateTest and TimeTest for the Event package
windrichie Apr 14, 2019
f49ba45
Merge pull request #10 from CS2113-AY1819S2-T11-1/master
windrichie Apr 14, 2019
0df12e9
fixed a bug in listactivity command. did not work for last element of…
windrichie Apr 14, 2019
d543a1a
fixed 2 bugs - AddCommand and ListActivityCommand
windrichie Apr 14, 2019
d23d8a5
fixed Travis checkstyle error - attempt #1
windrichie Apr 14, 2019
51873c5
fixed Travis checkstyle error - unused imports
windrichie Apr 14, 2019
f8bd1dd
Working on dev guide
Sameow Apr 14, 2019
b574ddd
fixed Travis checkstyle error - imports
windrichie Apr 14, 2019
88685fd
added a new test class for filtereventcommandparser
windrichie Apr 14, 2019
56e63ce
Merge pull request #7 from CS2113-AY1819S2-T11-1/master
JKupoluyi Apr 14, 2019
6836bdc
fixed test bugs for AddCommandParserTest (Travis)
windrichie Apr 14, 2019
7c8ca54
change function name
windrichie Apr 14, 2019
6068a1d
fixed Travis checkstyle error - unused imports
windrichie Apr 14, 2019
cd54663
fixed Travis checkstyle error - trailing whitespace
windrichie Apr 14, 2019
21bf456
Merge branch 'test-case-parser'
windrichie Apr 14, 2019
fa67f73
Merge pull request #86 from windrichie/master
Sameow Apr 14, 2019
6559931
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T11-1/main
Sameow Apr 14, 2019
2011164
Modulelist test
JKupoluyi Apr 14, 2019
a27498f
Update ModuleTest.java
JKupoluyi Apr 14, 2019
a00dfc0
updated User Guide and fixed a bug in AddActivityCommand (now it can …
windrichie Apr 14, 2019
048c95d
Merge branch 'master' into checkMaster
Sameow Apr 14, 2019
4812afe
added "+"s in user guide to make new line
windrichie Apr 14, 2019
4943bec
added "`" in user guide
windrichie Apr 14, 2019
2a27dd8
Merge pull request #87 from JKupoluyi/checkMaster
Sameow Apr 14, 2019
b231b28
Merge branch 'master' into master
Sameow Apr 14, 2019
4ef66f7
changed UI picture and the name of the app (top left)
windrichie Apr 14, 2019
34c386a
Merge pull request #88 from Sameow/master
windrichie Apr 14, 2019
d84d91c
added "Command Summary" section in User Guide
windrichie Apr 14, 2019
b4166a1
Merge pull request #11 from CS2113-AY1819S2-T11-1/master
windrichie Apr 14, 2019
ce56509
fixed Travis checkstyle error - trailing whitespace
windrichie Apr 14, 2019
f009313
Merge pull request #89 from windrichie/master
Sameow Apr 14, 2019
48a2835
refactor CheckAvailabilityEventCommand for better abstraction
windrichie Apr 14, 2019
7eb5b3c
added Dev Guide implementation for ListActivity
windrichie Apr 14, 2019
3cfabea
updated Project Portfolio pages for the tags
windrichie Apr 14, 2019
5fd9c4e
fixed naming of diagram
windrichie Apr 14, 2019
d0981da
Merge branch 'master' into master
windrichie Apr 14, 2019
db4f7c6
Updated Dev guide, user guide and portfolio.
JKupoluyi Apr 14, 2019
2177445
Merge branch 'checkMaster' of https://github.com/JKupoluyi/main into …
JKupoluyi Apr 14, 2019
f454797
Completed interleaving
Sameow Apr 14, 2019
690e0da
Merge pull request #93 from Sameow/master
Sameow Apr 14, 2019
2b3d9ce
Merge branch 'master' into master
Sameow Apr 14, 2019
8224053
Merge branch 'master' into checkMaster
JKupoluyi Apr 14, 2019
9edcd16
Fixed travis
Sameow Apr 14, 2019
894ba0f
Merge pull request #92 from JKupoluyi/checkMaster
Sameow Apr 14, 2019
8aa5528
updated Dev Guide and fixed the bug for timing of activity
windrichie Apr 14, 2019
6409fc5
Merge branch 'master' of https://github.com/windrichie/main
windrichie Apr 14, 2019
efeac62
Merge branch 'master' into master
windrichie Apr 14, 2019
de986e9
Update windrichie.adoc
windrichie Apr 14, 2019
54ff3c1
Update DeveloperGuide.adoc
windrichie Apr 14, 2019
3e76dc3
Update DeveloperGuide.adoc
windrichie Apr 14, 2019
3aecde4
Update DeveloperGuide.adoc
windrichie Apr 14, 2019
d515bca
Update EventCheckAvailabilityCommand.java
windrichie Apr 14, 2019
f0c03cd
update
Sameow Apr 14, 2019
c2cb39f
version update
windrichie Apr 14, 2019
0f8c349
Merge pull request #91 from windrichie/master
windrichie Apr 14, 2019
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
Binary file modified docs/diagrams/LogicComponentClassDiagram.pptx
Binary file not shown.
Binary file modified docs/images/LogicClassDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package seedu.address.model.person.modulelist;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.Test;

import seedu.address.testutil.Assert;

public class ModuleTest {

@Test
public void constructor_null_throwsNullPointerException() {
Assert.assertThrows(NullPointerException.class, () -> new Module(null));
}

@Test
public void constructor_invalidName_throwsIllegalArgumentException() {
String invalidModuleName = "CS32934802398";
Assert.assertThrows(IllegalArgumentException.class, () -> new Module(invalidModuleName));
}

@Test
public void isValidModuleName() {
// null name
Assert.assertThrows(NullPointerException.class, () -> Module.isValidModule(null));

// invalid name
assertFalse(Module.isValidModule("")); // empty string
assertFalse(Module.isValidModule(" ")); // spaces only
assertFalse(Module.isValidModule("^")); // only non-alphanumeric characters
assertFalse(Module.isValidModule("peter*")); // contains non-alphanumeric characters

// valid name
assertTrue(Module.isValidModule("CS2343")); // alphabets only
assertTrue(Module.isValidModule("CS2143")); // numbers only
assertTrue(Module.isValidModule("CSS2343")); // alphanumeric characters
assertTrue(Module.isValidModule("AL3333")); // with capital letters
}
}