Fixed merge conflice in Manifest.toml

CurricularAnalytics · Jan 6, 2019 · 7e4556b · 7e4556b
2 parents fd71dce + 4ba70b3
commit 7e4556b
Show file tree

Hide file tree

Showing 96 changed files with 12,938 additions and 945 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@
 docs/build/
 .DS_Store
 mkdocs.yml
+.ipynb_checkpoints
+temp.csv
+node_modules/
+yarn.lock
diff --git a/Manifest.toml b/Manifest.toml
@@ -31,12 +31,42 @@ git-tree-sha1 = "74096d749a7d58e2798abfc087fc6a2e36df0a75"
 uuid = "ad839575-38b3-5650-b840-f874b8c74a25"
 version = "0.8.1"
 
+[[CSV]]
+deps = ["CategoricalArrays", "DataFrames", "DataStreams", "Dates", "Mmap", "Parsers", "Profile", "Random", "Tables", "Test", "Unicode", "WeakRefStrings"]
+git-tree-sha1 = "6dd974f0da3adb8b610cbbba5c95f5efbfa7a4df"
+uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+version = "0.4.2"
+
+[[CategoricalArrays]]
+deps = ["Compat", "Future", "JSON", "Missings", "Printf", "Reexport"]
+git-tree-sha1 = "6362c49130b5888f5628bc197ee5f17aec7d2a88"
+uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597"
+version = "0.4.0"
+
+[[CodecZlib]]
+deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"]
+git-tree-sha1 = "e3df104c84dfc108f0ca203fd7f5bbdc98641ae9"
+uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
+version = "0.5.1"
+
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
 git-tree-sha1 = "ec61a16eed883ad0cfa002d7489b3ce6d039bb9a"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
 version = "1.4.0"
 
+[[DataFrames]]
+deps = ["CategoricalArrays", "CodecZlib", "Compat", "DataStreams", "Dates", "InteractiveUtils", "IteratorInterfaceExtensions", "LinearAlgebra", "Missings", "Printf", "Random", "Reexport", "SortingAlgorithms", "Statistics", "StatsBase", "TableTraits", "Tables", "Test", "TranscodingStreams", "Unicode", "WeakRefStrings"]
+git-tree-sha1 = "ad34fefb72b18a8dd5c17fab9089d11111b61935"
+uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+version = "0.14.1"
+
+[[DataStreams]]
+deps = ["Dates", "Missings", "Test", "WeakRefStrings"]
+git-tree-sha1 = "69c72a1beb4fc79490c361635664e13c8e4a9548"
+uuid = "9a8bc11e-79be-5b39-94d7-1ccc349a1a85"
+version = "0.4.1"
+
 [[DataStructures]]
 deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
 git-tree-sha1 = "8fc6e166e24fda04b2b648d4260cdad241788c54"
@@ -76,6 +106,10 @@ git-tree-sha1 = "9fdecc849480c511d7825570c20c9b64c4e5d5ed"
 uuid = "de31a74c-ac4f-5751-b3fd-e18cd04993ca"
 version = "0.4.0"
 
+[[Future]]
+deps = ["Random"]
+uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
+
 [[HTTP]]
 deps = ["Base64", "Dates", "Distributed", "IniFile", "MbedTLS", "Sockets", "Test"]
 git-tree-sha1 = "b881f69331e85642be315c63d05ed65d6fc8a05b"
@@ -104,6 +138,12 @@ version = "0.5.0"
 deps = ["LinearAlgebra", "Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
+[[IteratorInterfaceExtensions]]
+deps = ["Test"]
+git-tree-sha1 = "5484e5ede2a4137b9643f4d646e8e7b87b794415"
+uuid = "82899510-4779-5014-852e-03e436cf321d"
+version = "0.1.1"
+
 [[JSExpr]]
 deps = ["JSON", "MacroTools", "Observables", "Test", "WebIO"]
 git-tree-sha1 = "96429a372b5c4ad63fa9cbff6ba4178a85939705"
@@ -157,6 +197,12 @@ git-tree-sha1 = "c93a87da4081a3de781f34e0540175795a2ce83d"
 uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
 version = "0.6.6"
 
+[[Missings]]
+deps = ["Dates", "InteractiveUtils", "SparseArrays", "Test"]
+git-tree-sha1 = "adc26d2ee85a49c413464110d922cf21efc9d233"
+uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
+version = "0.3.1"
+
 [[Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
@@ -184,6 +230,12 @@ git-tree-sha1 = "85619a3f3e17bb4761fe1b1fd47f0e979f964d5b"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 version = "1.0.2"
 
+[[Parsers]]
+deps = ["Dates", "Mmap", "Test", "WeakRefStrings"]
+git-tree-sha1 = "03375f006e75773b58cbc293bd958aae4152ed1b"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "0.2.13"
+
 [[Pidfile]]
 deps = ["FileWatching", "Test"]
 git-tree-sha1 = "1ffd82728498b5071cde851bbb7abd780d4445f3"
@@ -198,6 +250,10 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
+[[Profile]]
+deps = ["Printf"]
+uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
+
 [[REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
@@ -237,6 +293,12 @@ version = "0.8.0"
 [[Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
+[[SortingAlgorithms]]
+deps = ["DataStructures", "Random", "Test"]
+git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd"
+uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
+version = "0.3.1"
+
 [[SparseArrays]]
 deps = ["LinearAlgebra", "Random"]
 uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -251,6 +313,18 @@ version = "0.9.2"
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[[StatsBase]]
+deps = ["DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "Test"]
+git-tree-sha1 = "723193a13e8078cec6dcd0b8fe245c8bfd81690e"
+uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+version = "0.25.0"
+
+[[TableTraits]]
+deps = ["IteratorInterfaceExtensions", "Test"]
+git-tree-sha1 = "da062a2c31f16178f68190243c24140801720a43"
+uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
+version = "0.4.0"
+
 [[Tables]]
 deps = ["Requires", "Test"]
 git-tree-sha1 = "c7fb447deab835fa70ce6717e78c68b0f466a42c"
@@ -261,6 +335,12 @@ version = "0.1.11"
 deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[TranscodingStreams]]
+deps = ["Pkg", "Random", "Test"]
+git-tree-sha1 = "a34a2d588e2d2825602bf14a24216d5c8b0921ec"
+uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
+version = "0.8.1"
+
 [[URIParser]]
 deps = ["Test", "Unicode"]
 git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69"
@@ -274,6 +354,12 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [[Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
+[[WeakRefStrings]]
+deps = ["Missings", "Random", "Test"]
+git-tree-sha1 = "1087e8be380f2c8b96434b02bb1150fc1c511135"
+uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
+version = "0.5.3"
+
 [[WebIO]]
 deps = ["AssetRegistry", "Base64", "Compat", "FunctionalCollections", "JSON", "Logging", "Observables", "Random", "Requires", "Sockets", "Test", "UUIDs", "Widgets"]
 git-tree-sha1 = "2ec8d6d64d209dd79fdd03f2b3db75a3409b4f74"

diff --git a/Project.toml b/Project.toml
@@ -5,6 +5,8 @@ version = "0.1.2"
 
 [deps]
 Blink = "ad839575-38b3-5650-b840-f874b8c74a25"
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"

diff --git a/REQUIRE b/REQUIRE
@@ -1 +1,13 @@
 julia 1.0
+Blink 0.8.1
+CSV 0.4.2
+DataFrames 0.14.1
+DataStructures 0.14.0
+Documenter 0.20.0
+HTTP 0.7.1
+JSON 0.19.0
+LightGraphs 1.2.0
+WebIO 0.6.0
+Markdown
+Printf
+Test
diff --git a/docs/make.jl b/docs/make.jl
@@ -17,8 +17,8 @@ makedocs(
         "Reading/Writing Curricula & Degree Plans"  => "persistence.md",
         "Visualizing Curricula & Degree Plans"      => "visualize.md",
         "Metrics"                                   => "metrics.md",
-        "Optimizing Degree Plans"                   => "optimizing.md",
-        "Simulating Student Flows"                  => "simulating.md",
+        #"Optimizing Degree Plans"                   => "optimizing.md",
+        #"Simulating Student Flows"                  => "simulating.md",
         "Contributing"                              => "contributing.md",
         "License Information"                       => "license.md",
         "Citing CurricularAnalytics.jl"             => "citing.md"

diff --git a/docs/src/BW-plan.png b/docs/src/BW-plan.png
diff --git a/docs/src/BW_plan.jl b/docs/src/BW_plan.jl
@@ -0,0 +1,18 @@
+using CurricularAnalytics
+
+A = Course("Introduction to Baskets", 3)
+B = Course("Introduction to Baskets Lab", 1)
+C = Course("Basic Basket Forms", 3)
+D = Course("Advanced Basketry", 3)
+
+add_requisite!(A, B, strict_co)
+add_requisite!(A, C, pre)
+add_requisite!(C, D, co)
+
+curric = Curriculum("Basket Weaving", [A,B,C,D])
+
+terms = Array{Term}(undef, 2)
+terms[1] = Term([A,B])
+terms[2] = Term([C,D])
+
+dp = DegreePlan("2-Term Plan", curric, terms)
diff --git a/docs/src/UK-EE-curric.png b/docs/src/UK-EE-curric.png
diff --git a/docs/src/UK-EE-degree-plan.png b/docs/src/UK-EE-degree-plan.png
diff --git a/docs/src/UK-EE-metrics.png b/docs/src/UK-EE-metrics.png
diff --git a/docs/src/curriculum-ex-viz.png b/docs/src/curriculum-ex-viz.png
diff --git a/docs/src/curriculum-ex.csv b/docs/src/curriculum-ex.csv
@@ -0,0 +1,15 @@
+Curriculum,Underwater Basket Weaving,,,,,,,,
+Institution,ACME State University,,,,,,,,
+Degree Type,AA,,,,,,,,
+System Type,semester,,,,,,,,
+CIP,50.0712,,,,,,,,
+Courses,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name
+1,Introduction to Baskets,BW,101,,,,3,,
+2,Swimming,PE,115,,,,3,,
+3,Introductory Calculus w/ Basketry Applications,MA,116,,,,4,,
+4,Basic Basket Forms,BW,111,1,,5,3,,
+5,Basic Basket Forms Lab,BW,111L,,,,1,,
+6,Advanced Basketry,BW,201,"4,5",3,,3,,
+7,Basket Materials & Decoration,BW,214,1,,,3,,
+8,Underwater Weaving,BW,301,2,7,,3,,
diff --git a/docs/src/curriculum-ex.png b/docs/src/curriculum-ex.png
diff --git a/docs/src/curriculum-format.csv b/docs/src/curriculum-format.csv
@@ -0,0 +1,15 @@
+Curriculum,Underwater Basket Weaving,,,,,,,,
+Institution,ACME State University,,,,,,,,
+Degree Type,AA,,,,,,,,
+System Type,semester,,,,,,,,
+CIP,445786,,,,,,,,
+Courses,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name
+1,Introduction to Baskets,BW,101,,,,3,,
+2,Swimming,PE,115,,,,3,,
+3,Introductory Calculus w/ Basketry Applications,MA,116,,,,4,,
+4,Basic Basket Forms,BW,111,1,,5,3,,
+5,Basic Basket Forms Lab,BW,111L,,,,1,,
+6,Advanced Basketry,BW,201,"4,5",3,,3,,
+7,Basket Materials & Decoration,BW,214,1,,,3,,
+8,Underwater Weaving,BW,301,2,7,,3,,
diff --git a/docs/src/curriculum-format.png b/docs/src/curriculum-format.png
diff --git a/docs/src/degree-plan-ex-viz.png b/docs/src/degree-plan-ex-viz.png
diff --git a/docs/src/degree-plan-ex.csv b/docs/src/degree-plan-ex.csv
@@ -0,0 +1,19 @@
+Curriculum,Underwater Basket Weaving,,,,,,,,,
+Degree Plan,Precalc Ready Students,,,,,,,,,
+Institution,ACME State University,,,,,,,,,
+Degree Type,AA,,,,,,,,,
+System Type,semester,,,,,,,,,
+CIP,50.0712,,,,,,,,,
+Courses,,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name,Term
+1,Introduction to Baskets,BW,101,,,,3,,,1
+2,Swimming,PE,115,,,,3,,,1
+3,Introductory Calculus w/ Basketry Applications,MA,116,9,,,4,,,2
+4,Basic Basket Forms,BW,111,1,,5,3,,,2
+5,Basic Basket Forms Lab,BW,111L,,,,1,,,2
+6,Advanced Basketry,BW,201,"4,5",3,,3,,,3
+7,Basket Materials & Decoration,BW,214,1,,,3,,,3
+8,Underwater Weaving,BW,301,2,7,,3,,,3
+Additional Courses,,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name,Term
+9,Precalculus w/ Basketry Applications,MA,110,,,,3,,,1
diff --git a/docs/src/degree-plan-ex.png b/docs/src/degree-plan-ex.png
diff --git a/docs/src/degree-plan-format.csv b/docs/src/degree-plan-format.csv
@@ -0,0 +1,16 @@
+Curriculum,String - required,,,,,,,,,
+Degree Plan,String - required,,,,,,,,,
+Institution,String,,,,,,,,,
+Degree Type,String,,,,,,,,,
+System Type,String,,,,,,,,,
+CIP,String,,,,,,,,,
+Courses,,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name,Term
+Integer - required,String - required,String,String,Integer,Integer,Integer,Integer - required,String,String,Integer - required
+Additional Courses,,,,,,,,,,
+Course ID,Course Name,Prefix,Number,Prerequisites,Corequisites,Strict-Corequisites,Credit Hours,Institution,Canonical Name,Term
+Integer - required,String - required,String,String,Integer,Integer,Integer,Integer - required,String,String,Integer - required
+,,,,,,,,,,
+,,,,,,,,,,
+,,,,,,,,,,
+,,,,,,,,,,
diff --git a/docs/src/degree-plan-format.png b/docs/src/degree-plan-format.png