diff --git a/content/1_Intro/About_This.md b/content/1_Intro/About_This.md index 29ab91b..c9b1cd3 100644 --- a/content/1_Intro/About_This.md +++ b/content/1_Intro/About_This.md @@ -1,5 +1,5 @@ --- -id: about +id: about-this title: About This Guide author: Nathan Wang, Benjamin Qi --- diff --git a/content/1_Intro/Data_Types.md b/content/1_Intro/Data_Types.md index 71e8562..526cce1 100644 --- a/content/1_Intro/Data_Types.md +++ b/content/1_Intro/Data_Types.md @@ -1,5 +1,5 @@ --- -id: data +id: data-types title: Data Types author: Darren Yao --- diff --git a/content/1_Intro/Intro_Problems.md b/content/1_Intro/Example_Problem.md similarity index 94% rename from content/1_Intro/Intro_Problems.md rename to content/1_Intro/Example_Problem.md index 8fc255f..bd8ae7a 100644 --- a/content/1_Intro/Intro_Problems.md +++ b/content/1_Intro/Example_Problem.md @@ -1,6 +1,6 @@ --- -id: problems -title: Introductory Problems +id: ex-prob +title: An Example Problem author: Nathan Wang, Benjamin Qi, Darren Yao problems: - bronze_promote @@ -9,7 +9,7 @@ problems: - bronze_square --- -Solutions for an introductory USACO problem in multiple languages. +Solutions for an example USACO problem in multiple languages. @@ -179,11 +179,9 @@ for i in range(100): fout.write(str(ans)) ``` -## Problems +## Introductory Problems -Let's begin by solving a few problems! The following require relatively little programming experience and no algorithmic knowledge. - -Do as many as you want, then move on! You do not have to do all of them. +The following require relatively little programming experience and no algorithmic knowledge. Do as many as you want, then move on! You do not have to do all of them. - [Promotion Counting](http://usaco.org/index.php?page=viewproblem2&cpid=591) - [Word Processor](http://usaco.org/index.php?page=viewproblem2&cpid=987) diff --git a/content/1_Intro/Intro_Start.md b/content/1_Intro/Getting_Started.md similarity index 100% rename from content/1_Intro/Intro_Start.md rename to content/1_Intro/Getting_Started.md diff --git a/content/1_Intro/Input_Output.md b/content/1_Intro/Input_Output.md index faaf863..9829111 100644 --- a/content/1_Intro/Input_Output.md +++ b/content/1_Intro/Input_Output.md @@ -1,11 +1,10 @@ --- id: io -title: Input and Output +title: Input & Output author: Darren Yao -order: 5 --- -Demonstrates how to read in input and print output for USACO. +Demonstrates how to read input and print output for USACO. diff --git a/content/1_Intro/Intro_Practicing.md b/content/1_Intro/Practicing.md similarity index 100% rename from content/1_Intro/Intro_Practicing.md rename to content/1_Intro/Practicing.md diff --git a/content/1_Intro/Intro_Prerequisites.md b/content/1_Intro/Prerequisites.md similarity index 98% rename from content/1_Intro/Intro_Prerequisites.md rename to content/1_Intro/Prerequisites.md index 72254e3..5b476ce 100644 --- a/content/1_Intro/Intro_Prerequisites.md +++ b/content/1_Intro/Prerequisites.md @@ -1,5 +1,5 @@ --- -id: prerequisites +id: prereqs title: Prerequisites author: Nathan Wang --- diff --git a/content/1_Intro/Intro_RunningCpp.md b/content/1_Intro/Running_Cpp.md similarity index 100% rename from content/1_Intro/Intro_RunningCpp.md rename to content/1_Intro/Running_Cpp.md diff --git a/content/2_General/5_Strategy.md b/content/2_General/Contest_Strategy.md similarity index 66% rename from content/2_General/5_Strategy.md rename to content/2_General/Contest_Strategy.md index db4df68..c50c481 100644 --- a/content/2_General/5_Strategy.md +++ b/content/2_General/Contest_Strategy.md @@ -1,5 +1,5 @@ --- -id: strategy +id: contest-strategy title: Contest Strategy author: ? --- \ No newline at end of file diff --git a/content/2_General/2_Contests.md b/content/2_General/Contests.md similarity index 100% rename from content/2_General/2_Contests.md rename to content/2_General/Contests.md diff --git a/content/2_General/6_Debugging.md b/content/2_General/Debugging.md similarity index 100% rename from content/2_General/6_Debugging.md rename to content/2_General/Debugging.md diff --git a/content/2_General/7_Macros.md b/content/2_General/Macros.md similarity index 100% rename from content/2_General/7_Macros.md rename to content/2_General/Macros.md diff --git a/content/2_General/8_Proposing.md b/content/2_General/Proposing.md similarity index 100% rename from content/2_General/8_Proposing.md rename to content/2_General/Proposing.md diff --git a/content/2_General/1_Resources.md b/content/2_General/Resources.md similarity index 100% rename from content/2_General/1_Resources.md rename to content/2_General/Resources.md diff --git a/content/2_General/3_WhyCpp.md b/content/2_General/Why_Cpp.md similarity index 100% rename from content/2_General/3_WhyCpp.md rename to content/2_General/Why_Cpp.md diff --git a/content/3_Bronze/1_Bronze_Overview.md b/content/3_Bronze/0_Bronze_Overview.md similarity index 100% rename from content/3_Bronze/1_Bronze_Overview.md rename to content/3_Bronze/0_Bronze_Overview.md diff --git a/content/3_Bronze/8_Bronze_Complete.md b/content/3_Bronze/Complete_Search.md similarity index 100% rename from content/3_Bronze/8_Bronze_Complete.md rename to content/3_Bronze/Complete_Search.md diff --git a/content/3_Bronze/4_Bronze_Containers.md b/content/3_Bronze/Cpp_Containers.md similarity index 100% rename from content/3_Bronze/4_Bronze_Containers.md rename to content/3_Bronze/Cpp_Containers.md diff --git a/content/3_Bronze/5_Bronze_DS_Common.md b/content/3_Bronze/DS.md similarity index 100% rename from content/3_Bronze/5_Bronze_DS_Common.md rename to content/3_Bronze/DS.md diff --git a/content/3_Bronze/3_Bronze_Collections.md b/content/3_Bronze/Java_Collections.md similarity index 100% rename from content/3_Bronze/3_Bronze_Collections.md rename to content/3_Bronze/Java_Collections.md diff --git a/content/3_Bronze/6_Bronze_Pairs.md b/content/3_Bronze/Pairs.md similarity index 100% rename from content/3_Bronze/6_Bronze_Pairs.md rename to content/3_Bronze/Pairs.md diff --git a/content/3_Bronze/2_Bronze_Rect.md b/content/3_Bronze/Rect_Geo.md similarity index 97% rename from content/3_Bronze/2_Bronze_Rect.md rename to content/3_Bronze/Rect_Geo.md index 902bfdf..500ab55 100644 --- a/content/3_Bronze/2_Bronze_Rect.md +++ b/content/3_Bronze/Rect_Geo.md @@ -1,5 +1,5 @@ --- -id: rectangle-geometry +id: rect-geo title: "Rectangle Geometry" author: Darren Yao --- diff --git a/content/3_Bronze/7_Bronze_Simulation.md b/content/3_Bronze/Simulation.md similarity index 100% rename from content/3_Bronze/7_Bronze_Simulation.md rename to content/3_Bronze/Simulation.md diff --git a/content/4_Silver/5_Silver_2P.md b/content/4_Silver/2P.md similarity index 98% rename from content/4_Silver/5_Silver_2P.md rename to content/4_Silver/2P.md index 9860920..f059b31 100644 --- a/content/4_Silver/5_Silver_2P.md +++ b/content/4_Silver/2P.md @@ -1,5 +1,5 @@ --- -id: two-pointers +id: 2P title: "Two Pointers" author: Darren Yao prerequisites: diff --git a/content/4_Silver/4_Silver_BinSearch.md b/content/4_Silver/Binary_Search.md similarity index 100% rename from content/4_Silver/4_Silver_BinSearch.md rename to content/4_Silver/Binary_Search.md diff --git a/content/4_Silver/8_Silver_DFS.md b/content/4_Silver/DFS.md similarity index 100% rename from content/4_Silver/8_Silver_DFS.md rename to content/4_Silver/DFS.md diff --git a/content/4_Silver/7_Silver_DS.md b/content/4_Silver/Data_Structures.md similarity index 100% rename from content/4_Silver/7_Silver_DS.md rename to content/4_Silver/Data_Structures.md diff --git a/content/4_Silver/2_Silver_Greedy.md b/content/4_Silver/Greedy.md similarity index 100% rename from content/4_Silver/2_Silver_Greedy.md rename to content/4_Silver/Greedy.md diff --git a/content/4_Silver/6_Silver_Psum.md b/content/4_Silver/Prefix_Sums.md similarity index 100% rename from content/4_Silver/6_Silver_Psum.md rename to content/4_Silver/Prefix_Sums.md diff --git a/content/4_Silver/3_Silver_Sorting.md b/content/4_Silver/Sorting.md similarity index 99% rename from content/4_Silver/3_Silver_Sorting.md rename to content/4_Silver/Sorting.md index fd74305..a713d13 100644 --- a/content/4_Silver/3_Silver_Sorting.md +++ b/content/4_Silver/Sorting.md @@ -2,7 +2,6 @@ id: sorting title: "Sorting" author: Siyong (WIP) -order: 3 prerequisites: - - Silver - Containers diff --git a/content/4_Silver/1_Silver_Complexity.md b/content/4_Silver/Time_Comp.md similarity index 97% rename from content/4_Silver/1_Silver_Complexity.md rename to content/4_Silver/Time_Comp.md index c6ffcca..7555c24 100644 --- a/content/4_Silver/1_Silver_Complexity.md +++ b/content/4_Silver/Time_Comp.md @@ -1,5 +1,5 @@ --- -id: complexity +id: time-comp title: "Time Complexity" author: Darren Yao, Benjamin Qi --- diff --git a/content/5_Gold/2_Gold_BFS.md b/content/5_Gold/BFS.md similarity index 100% rename from content/5_Gold/2_Gold_BFS.md rename to content/5_Gold/BFS.md diff --git a/content/5_Gold/6_Gold_BIT.md b/content/5_Gold/BIT.md similarity index 100% rename from content/5_Gold/6_Gold_BIT.md rename to content/5_Gold/BIT.md diff --git a/content/5_Gold/1_Gold_DP.md b/content/5_Gold/DP.md similarity index 100% rename from content/5_Gold/1_Gold_DP.md rename to content/5_Gold/DP.md diff --git a/content/5_Gold/8_Gold_DP_Trees.md b/content/5_Gold/DP_Trees.md similarity index 100% rename from content/5_Gold/8_Gold_DP_Trees.md rename to content/5_Gold/DP_Trees.md diff --git a/content/5_Gold/7_Gold_NT.md b/content/5_Gold/Intro_NT.md similarity index 96% rename from content/5_Gold/7_Gold_NT.md rename to content/5_Gold/Intro_NT.md index af36a88..95289c6 100644 --- a/content/5_Gold/7_Gold_NT.md +++ b/content/5_Gold/Intro_NT.md @@ -1,5 +1,5 @@ --- -id: introductory-number-theory +id: intro-nt title: "Introductory Number Theory" author: Unknown --- diff --git a/content/5_Gold/5_Gold_MST.md b/content/5_Gold/MST.md similarity index 100% rename from content/5_Gold/5_Gold_MST.md rename to content/5_Gold/MST.md diff --git a/content/5_Gold/4_Gold_SP.md b/content/5_Gold/SP.md similarity index 100% rename from content/5_Gold/4_Gold_SP.md rename to content/5_Gold/SP.md diff --git a/content/5_Gold/3_Gold_TopoSort.md b/content/5_Gold/TopoSort.md similarity index 100% rename from content/5_Gold/3_Gold_TopoSort.md rename to content/5_Gold/TopoSort.md diff --git a/content/6_Plat/2_Plat_1DRQ.md b/content/6_Plat/1DRQ.md similarity index 100% rename from content/6_Plat/2_Plat_1DRQ.md rename to content/6_Plat/1DRQ.md diff --git a/content/6_Plat/3_Plat_2DRQ.md b/content/6_Plat/2DRQ.md similarity index 100% rename from content/6_Plat/3_Plat_2DRQ.md rename to content/6_Plat/2DRQ.md diff --git a/content/6_Plat/7_Plat_Bitset.md b/content/6_Plat/Bitset.md similarity index 100% rename from content/6_Plat/7_Plat_Bitset.md rename to content/6_Plat/Bitset.md diff --git a/content/6_Plat/10_DP_Bitmasks.md b/content/6_Plat/DP_Bitmasks.md similarity index 100% rename from content/6_Plat/10_DP_Bitmasks.md rename to content/6_Plat/DP_Bitmasks.md diff --git a/content/6_Plat/11_DP_Ranges.md b/content/6_Plat/DP_Ranges.md similarity index 100% rename from content/6_Plat/11_DP_Ranges.md rename to content/6_Plat/DP_Ranges.md diff --git a/content/6_Plat/8_Plat_Fracture.md b/content/6_Plat/Fracture.md similarity index 100% rename from content/6_Plat/8_Plat_Fracture.md rename to content/6_Plat/Fracture.md diff --git a/content/6_Plat/4_Plat_Geo.md b/content/6_Plat/Geometry.md similarity index 100% rename from content/6_Plat/4_Plat_Geo.md rename to content/6_Plat/Geometry.md diff --git a/content/6_Plat/5_Plat_Graphs.md b/content/6_Plat/Graphs.md similarity index 100% rename from content/6_Plat/5_Plat_Graphs.md rename to content/6_Plat/Graphs.md diff --git a/content/6_Plat/0_Plat_Olympiads.md b/content/6_Plat/Olympiads.md similarity index 100% rename from content/6_Plat/0_Plat_Olympiads.md rename to content/6_Plat/Olympiads.md diff --git a/content/6_Plat/9_Plat_Slope.md b/content/6_Plat/Slope.md similarity index 100% rename from content/6_Plat/9_Plat_Slope.md rename to content/6_Plat/Slope.md diff --git a/content/6_Plat/6_Plat_Strings.md b/content/6_Plat/Strings.md similarity index 99% rename from content/6_Plat/6_Plat_Strings.md rename to content/6_Plat/Strings.md index 8906a7e..c1df6ca 100644 --- a/content/6_Plat/6_Plat_Strings.md +++ b/content/6_Plat/Strings.md @@ -1,5 +1,5 @@ --- -id: hashing +id: strings title: "Strings" author: Benjamin Qi prerequisites: diff --git a/content/6_Plat/1_Plat_Trees.md b/content/6_Plat/Trees.md similarity index 100% rename from content/6_Plat/1_Plat_Trees.md rename to content/6_Plat/Trees.md diff --git a/content/1_Intro/Intro_Syllabus.md b/content/Syllabus.md similarity index 98% rename from content/1_Intro/Intro_Syllabus.md rename to content/Syllabus.md index 177ba7d..fda568b 100644 --- a/content/1_Intro/Intro_Syllabus.md +++ b/content/Syllabus.md @@ -1,9 +1,11 @@ --- id: syllabus title: Syllabus -author: Benjamin Qi, I FORGOT WHO ELSE EVERYONE PUT YOUR NAME HERE :D +author: Benjamin Qi --- +(outdated) + Below, we've compiled some of the main topics for each division. diff --git a/content/ordering.js b/content/ordering.js index c4f3c13..436153e 100644 --- a/content/ordering.js +++ b/content/ordering.js @@ -2,69 +2,94 @@ const ModuleOrdering = { "intro": [ "about-this", "getting-started", - "prerequisites", + "prereqs", "running-cpp", - "problems", - "syllabus", + "data-types", + "io", + "ex-prob", + "practicing", ], "general": [ "resources", "contests", - "why-cpp", - "practicing", - "strategy", - "debugging", - "macros", + "contest-strategy", "proposing", + "why-cpp", + "macros", + "debugging", ], "bronze": [ - "overview", - "rectangle-geometry", - "collections", - "containers", - "ds", - "pairs", + "rect-geo", + { + name: "Data Structures", + items: [ + "collections", + "containers", + "pairs", + "ds", + ] + }, "simulation", "complete-search", ], "silver": [ - "complexity", + "time-comp", "greedy", "sorting", "binary-search", - "two-pointers", + "2P", "prefix-sums", "data-structures", "dfs" ], "gold": [ - "dp", - "bfs", - "toposort", - "sp", - "mst", + "intro-nt", "bit", - "introductory-number-theory", - "dp-trees" + { + name: "Graphs", + items: [ + "bfs", + "toposort", + "sp", + "mst" + ] + }, + { + name: "Dynamic Programming", + items: [ + "dp", + "dp-trees" + ] + } ], "plat": [ "oly", - "trees", - "1DRQ", - "2DRQ", - "geo", - "graphs", - "hashing", - "bitset", - "fracture", - "slope", + { + name: "Range Queries", + items: [ + "1DRQ", + "2DRQ", + ] + }, + { + name: "Graphs", + items: [ + "trees", + "graphs", + ] + }, { name: "Dynamic Programming", items: [ "dp-bitmasks", - "dp-ranges" + "dp-ranges", + "slope", ] - } + }, + "geo", + "strings", + "bitset", + "fracture", ] };