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

Updated JsonUtil #94

Merged
merged 8 commits into from
Apr 3, 2019
Merged

Conversation

monikernemo
Copy link

added new static method in JsonUtil: readJsonFileFromInputStream
Creates Json object from a string that contains the path of the file that will be read as an input stream.
Manually tested this with the Jar release from this update. No errors so far.

Updated ModuleInfo related storage and Course related storage components to accommodate reading file from input stream

Now condition stores a Pattern, pattern, and an int, minToSatisfy (signifiying the minimum number of unique modules must match the pattern
in order to satisfy the condition). Removed conditionName attribute from Condition class.
PrimitiveRequirement stores a list of Conditions.

Also changed classes and tests that depended on the new PrimitiveRequirement and Condition classes. Created new Json files for course due to the structural changes above.

Realised that completing at least 40 modules is not really a Graduation requirement since NUS counts modular credits instead of module count. But we can leave it for now.
Creates Json object from an string that contains the path of the file to be read as an input stream
Updated ModuleInfo related storage and Course related storage components to accomodate reading from input stream
@monikernemo monikernemo merged commit 18b9cf9 into cs2103-ay1819s2-w14-4:master Apr 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant