From bf09b095f34de04c7e3f63dc36b241dbb455cd54 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Wed, 26 Oct 2022 10:15:42 -0700 Subject: [PATCH] more linux compatible good practice stuff? --- error.py | 2 +- scheduleGenerator/generator.py | 9 ++++++--- tinker.py | 9 +++++---- util/debug.py | 2 +- util/estimateGrade.py | 19 +++++++++++-------- util/generateCourses.py | 8 +++++--- util/mockStudents.py | 8 +++++--- 7 files changed, 34 insertions(+), 23 deletions(-) mode change 100644 => 100755 error.py mode change 100644 => 100755 scheduleGenerator/generator.py mode change 100644 => 100755 tinker.py mode change 100644 => 100755 util/debug.py mode change 100644 => 100755 util/estimateGrade.py mode change 100644 => 100755 util/generateCourses.py mode change 100644 => 100755 util/mockStudents.py diff --git a/error.py b/error.py old mode 100644 new mode 100755 index 7d0dba7..01847ce --- a/error.py +++ b/error.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 import json with open('./output/students.json') as f: students = json.load(f) diff --git a/scheduleGenerator/generator.py b/scheduleGenerator/generator.py old mode 100644 new mode 100755 index 8a8163b..6e9f305 --- a/scheduleGenerator/generator.py +++ b/scheduleGenerator/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 import json import random from inspect import currentframe @@ -589,7 +589,7 @@ def generateScheduleV3( return running -if __name__ == '__main__': +def main(): print("Processing...") sampleStudents = getSampleStudents(True) @@ -601,4 +601,7 @@ if __name__ == '__main__': with open("../output/timetable.json", "w") as outfile: json.dump(timetable, outfile, indent=2) - print("Done") \ No newline at end of file + print("Done") + +if __name__ == '__main__': + main() diff --git a/tinker.py b/tinker.py old mode 100644 new mode 100755 index dc7126b..ccbbb48 --- a/tinker.py +++ b/tinker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.113.11 from os.path import exists as file_exists from prettytable import PrettyTable from typing import Tuple @@ -53,15 +53,14 @@ def errorOutput(students) -> Tuple[PrettyTable, dict, dict]: return t, conflicts["Critical"], conflicts["Acceptable"] -if __name__ == '__main__': - +def main(): showError = False noAnim = False for e in sys.argv: if e.lower().replace('_', '') == 'showerror': showError = True if e.lower().replace('_', '') == 'noanim': noAnim = True - if len(sys.argv) in (1, 2) and sys.argv[1].lower() not in ('no_refresh', 'errors'): + if (len(sys.argv) > 1 and sys.argv[1] not in ('no_refresh', 'errors')) or len(sys.argv) == 1: print() st = time() # Start time @@ -185,3 +184,5 @@ if __name__ == '__main__': print("Invalid argument") exit() +if __name__ == '__main__': + main() diff --git a/util/debug.py b/util/debug.py old mode 100644 new mode 100755 index 85b731e..66bb87a --- a/util/debug.py +++ b/util/debug.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 # Define global debug function debug = lambda data : print(f'>> Debug: {data}') if type(data) == str else print('>> Debug: ', data) \ No newline at end of file diff --git a/util/estimateGrade.py b/util/estimateGrade.py old mode 100644 new mode 100755 index 8566f6b..d8598bc --- a/util/estimateGrade.py +++ b/util/estimateGrade.py @@ -1,12 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 import json -# Get students -try: - with open("../output/students.json", 'r') as studentFile: students = json.load(studentFile) -except FileNotFoundError: - with open("./output/students.json", 'r') as studentFile: students = json.load(studentFile) - flex = ("XAT--12A-S", "XAT--12B-S") most_frequent = lambda l : max(set(l), key = l.count) @@ -23,7 +17,13 @@ def getEstimatedGrade(pupil: dict) -> int: return None if len(grades) == 0 else most_frequent(grades) # Final estimate of grade -if __name__ == '__main__': +def main(): + # Get students + try: + with open("../output/students.json", 'r') as studentFile: students = json.load(studentFile) + except FileNotFoundError: + with open("./output/students.json", 'r') as studentFile: students = json.load(studentFile) + # Define students grade level for student in students: student["gradelevel"] = getEstimatedGrade(student) @@ -33,3 +33,6 @@ if __name__ == '__main__': except FileNotFoundError: with open('./output/students/json', 'w') as studnetFile: json.dump(students, studentFile, indent=2) + +if __name__ == '__main__': + main() diff --git a/util/generateCourses.py b/util/generateCourses.py old mode 100644 new mode 100755 index a67f8c3..76b44e2 --- a/util/generateCourses.py +++ b/util/generateCourses.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 import json import csv @@ -28,9 +28,11 @@ def getSampleCourses(data_dir, log=False) -> dict: return realCourses - -if __name__ == '__main__': +def main(): courseSet: dict = getSampleCourses("../sample_data/course_selection_data.csv") with open("../output/courses.json", "w") as outfile: json.dump(courseSet, outfile, indent=2) + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/util/mockStudents.py b/util/mockStudents.py old mode 100644 new mode 100755 index 616c64c..532c016 --- a/util/mockStudents.py +++ b/util/mockStudents.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.11 import json import csv from util.estimateGrade import getEstimatedGrade @@ -63,11 +63,13 @@ def getSampleStudents(data_dir: str, log: bool = False) -> list[dict]: return mockStudents - -if __name__ == '__main__': +def main(): studentRequests: list[dict] = getSampleStudents("../sample_data/course_selection_data.csv") with open("../output/students.json", "w") as outfile: json.dump(studentRequests, outfile, indent=2) print("done") + +if __name__ == '__main__': + main() \ No newline at end of file