Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
28071ee
init and add names to feedback
emosy Oct 6, 2019
34be5ce
readcsv by country name
muditg317 Oct 6, 2019
bcf5164
added dummy emthods to DisasterDescription.java to make junit tests n…
muditg317 Oct 6, 2019
eaebe79
added withHeader and withoutHeader methods
emosy Oct 6, 2019
1ca6e4c
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
2aec2d9
added in template javadocs to be filled in as completed
muditg317 Oct 6, 2019
e96ad1f
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
4aa0b2d
removed bracket and fixed indents
emosy Oct 6, 2019
1754578
added util method and initialized stuff for DD class
emosy Oct 6, 2019
359d818
getMostImpactfulYearByCategory
muditg317 Oct 6, 2019
b543a55
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
fae8eef
added getTotalReportedIncidentsByCategory and DD constructor
emosy Oct 6, 2019
da352cf
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
2303670
refactor getMostImpactfulYearByCategory
muditg317 Oct 6, 2019
3d5c47a
added getMostImpactfulYear
emosy Oct 6, 2019
f0b0af6
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
2ef6c60
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
8495813
ignore class in gitignore
emosy Oct 6, 2019
40f3463
fixed getYear method in DD
emosy Oct 6, 2019
1fdff72
correct getMostImpactfulYear
muditg317 Oct 6, 2019
f116f85
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
d21c219
added countImpactfulYearsWithReportedIncidentsWithinRange method
emosy Oct 6, 2019
57c0d7b
update gitignore for class files
muditg317 Oct 6, 2019
015cbdf
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
3db8f1f
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
464bef3
firstRecordsHaveMoreReportedIndicents
muditg317 Oct 6, 2019
7ff1e48
fixed countImpactfulYearsWithReportedIncidentsWithinRange
emosy Oct 6, 2019
34bd75d
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
c0b0070
updated feedback
emosy Oct 6, 2019
f1ec69b
added one javadoc on util class
emosy Oct 6, 2019
c1aac4c
filling in javadocs
muditg317 Oct 6, 2019
ef4334b
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
e44f180
added exceptions and javadocs to DD class
emosy Oct 6, 2019
06f3171
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
94f2f2c
removed target from tracking
emosy Oct 6, 2019
2c0c706
minimized used imports, continue javadocs
muditg317 Oct 6, 2019
633f4ad
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
df6aa18
removed exceptions
emosy Oct 6, 2019
42f6279
added JRI to resources
emosy Oct 6, 2019
b84d2f3
adding optimizations to code (cleanliness, conventions, efficiency-ti…
muditg317 Oct 6, 2019
414cf62
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
618a49c
finalize optimizations and neatness, corrected oversights related to …
muditg317 Oct 6, 2019
b8360e2
created DisasterDataVisualizer
emosy Oct 6, 2019
0f85478
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
emosy Oct 6, 2019
d621eb0
added some R stuff
emosy Oct 6, 2019
8d331c9
removed R
emosy Oct 6, 2019
0ee1163
updated feedback.txt
muditg317 Oct 6, 2019
b571b0a
Merge branch 'master' of https://github.com/emosy/2019-StateFarm-Codi…
muditg317 Oct 6, 2019
64bd11a
update classpath
muditg317 Oct 6, 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
50 changes: 50 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.class
target/*
*/target
target
target/
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>codingcompetition2019</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
2 changes: 2 additions & 0 deletions .settings/org.eclipse.jdt.apt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
9 changes: 9 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.5
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
17 changes: 12 additions & 5 deletions feedback.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
Your team (name of each individual participating):
How many JUnits were you able to get to pass?
Your team (name of each individual participating): Mudit Gupta and Ryan Thomas Lynch
How many JUnits were you able to get to pass? 10/10

Document and describe any enhancements included to help the judges properly grade your submission.
Step 1:
Step 2:

Added Javadocs
We wanted to make our code as understandable as possible, so the addition of javadocs makes
each function very simple to understand.
Following CheckStyle-6.2.2
To ensure cleanliness and readability in our code, we decided to follow the guidelines
established by CheckStyle-6.2.2.
Attempting to be time efficient with iterations over functions based on disaster category
The code will only perform evaluations for entries of the correct category. Once an entry
is found in the wrong category, the function will stop processing the list given that the
data is sorted by category.

Feedback for the coding competition? Things you would like to see in future events?
Loading