@@ -1,12 +1,13 @@
 # leetcode-problem-picker
 
-## Purpose:
-This project was a response to my reoccurring question *"Which leetcode problem should I do next?"*
+## "Which problem should I do next?"
 
-Over time I found that the answer varies, depending on progress, needs, and goals:
-1. **Topic Focus**: Narrow down to 1+ subjects e.g. "only do problems related to graphs or DP".
-2. **Filtered Lists**: Honing in on questions asked by desired companies. Applies to lists like Blind's Curated 75.
-3. **Level Up** (WIP): Deduces user's "skill range" for each topic in order to challenge (but not discourage).
+When a problem is too easy, you're wasting your time. Too difficult, and you may soon get discouraged.
+
+During my leetcode journey, I discovered the answer to "which problems should I do next?" depend on goals and progress. I categorized these and gave them names.
+1. **Topic Focus**: Narrow down to 1+ subjects e.g. "trees, graphs or DP". Intended for learning and retaining.
+2. **Frequently Asked**: Questions from a list, e.g. ones asked by companies or list of Blind's Curated 75.
+3. **Level Up** (WIP): Deduces user's "skill range" for each topic in order to challenge appropriately.
 4. **Weighted random** (TODO): Weighted towards questions with high like count, greater like/dislike ratio, etc.
 
 ## Setup:
@@ -31,10 +32,10 @@ Displays information about a specific problem: Name, difficulty, Acceptance rate
 This mode selects and displays a single problem and waits for input:
 
 ```
-info displays details about problem. problem name, difficulty, acceptance rate
-hint displays related topics
-y/n,num_errs,time data regarding attempt. See Completed Problems section for more details
-easy mark as completed with low completion time, then selects a different problem
+info displays details about problem: problem name, difficulty, acceptance rate
+hint displays topics related to a solution
+y/n,num_errs,time Enter data regarding attempt. See next section for details
+easy mark as completed (quickly), then selects a different problem
 hard adds to a hard/skipped list. selects a less similar, less challenging problem
 revisit [ID] mark problem as one to revisit later
 refresh [ID] mark problem as one to "refresh" on later

@@ -79,7 +79,7 @@ def mark_problem(user_data, mark_type, leetcode_id):
 problem_to_companies = load_json('problem_to_companies.json')
 company_to_problems = load_json('company_to_problems.json')
 all_problems = load_json('all_problems.json')
-companies = user_data["faang"] + user_data["my_companies]"] # all companies?
+my_companies = set(user_data["faang"] + user_data["my_companies]"])
 
 #populate company file w/ maximum of 4 lines (sorted). each line is a comma separated list of problem numbers.
 # question: does 1yr,2yr and alltime contain 6mo? does 2yr contain 1yr? I think not?
@@ -100,9 +100,6 @@ def mark_problem(user_data, mark_type, leetcode_id):
 problems = pick_problems(user_data, problems=problem_set, topic_list=args.topic_list, k=args.num_problems)
 problem_set -= set(problems)
 
-#for company in companies:
-# d[company] = get_the_question_set(get_frequencies([company]))
-
 valid_inputs = ["info", "hint", "easy", "hard", "quit", "pause", "break"]
 print(f"Other valid inputs: {', '.join(valid_inputs)}")
 
@@ -119,10 +116,11 @@ def mark_problem(user_data, mark_type, leetcode_id):
 # TODO need problem to topic dictionary
 raise Exception("Not Implemented Yet")
 elif inp == 'info':
-company_list = problem_to_companies[leetcode_id]
 difficulty_string = "medium difficulty" if problem['Difficulty'] == "Medium" else "considered easy" if problem['Difficulty'] == 'Easy' else problem['Difficulty']
 print(f"{leetcode_id} {problem['Name']} is {difficulty_string}: {problem['Acceptance']} of submissions pass")
-print(f"{len(company_list)} have asked this question: {', '.join(company_list)}")
+company_list = my_companies & set(problem_to_companies[leetcode_id])
+company_list_string = f"including: {', '.join(company_list)}" if len(company_list) > 0 else f"including: {','.join(problem_to_companies[leetcode_id][:5])}"
+print(f"{len(company_list)} companies have asked this question {company_list_string}")
 elif inp == 'pause':
 input("Paused. Press Enter to continue the clock\n")
 elif inp == 'break':
@@ -132,17 +130,19 @@ def mark_problem(user_data, mark_type, leetcode_id):
 mark_completed(leetcode_id, 'yes', '0', '5')
 # Replace with new problem not in problems
 leetcode_id = pick_problems(user_data, problems=problem_set, topic_list=args.topic_list, k=1)[0]
+problem_set.discard(leetcode_id)
 start_time = timer()
 elif inp == 'hard':
 mark_problem(user_data, 'hard', leetcode_id)
 leetcode_id = pick_problems(user_data, problems=problem_set, topic_list=args.topic_list, k=1)[0]
+problem_set.discard(leetcode_id)
 # TODO pick problem with same topic and higher acceptance rate (if possible). If none, default to above line
 start_time = timer()
 elif inp.startswith('revisit'):
-leetcode_id = inp.split(' ')[1] if len(inp.split(' ')) > 0 else leetcode_id
+leetcode_id = int(inp.split(' ')[1]) if len(inp.split(' ')) > 0 else leetcode_id
 mark_problem(user_data, 'revisit', leetcode_id)
 elif inp.startswith('refresh'):
-leetcode_id = inp.split(' ')[1] if len(inp.split(' ')) > 0 else leetcode_id
+leetcode_id = int(inp.split(' ')[1]) if len(inp.split(' ')) > 0 else leetcode_id
 mark_problem(user_data, 'refresh', leetcode_id)
 elif inp.startswith('y') or inp.startswith('n'):
 # log entry into csv

@@ -2,6 +2,11 @@
 "blind75": [
 1,3,5,6,8,11,15,19,20,21,22,23,23,31,33,33,39,46,48,49,53,53,54,55,56,57,62,63,70,73,76,78,79,91,98,98,100,102,104,105,121,124,125,127,128,133,139,141,143,152,153,153,190,191,198,200,205,206,207,208,209,211,212,213,217,226,230,235,238,242,268,283,295,297,300,322,338,347,371,373,377,392,417,424,435,560,572,617,647,695,703,779,1011
 ],
+"faang": [
+"facebook", "amazon", "apple", "", "google"
+],
+"my_companies": [
+],
 "completed": [
 
 ],