Commit d262493c authored by Jack Otto's avatar Jack Otto
Browse files

11/29/21 jack changes

parent fc4288a6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# List of all classes # List of all classes
#Test classes #Test classes
test_inputs = True test_inputs = False
classes = [ classes = [
['MECH 202 01', 1, 19, 'Computers', ['We'], '1'], ['MECH 202 01', 1, 19, 'Computers', ['We'], '1'],
......
gtgvhs7ma7qtoa0pcdm3aijun8 hn1j0voglmb89n4d80bq2hf3l8
d0hfnt84qv5091vmr56e6vvq88 mv6702pcqf713t2umi6mfhq2k8
q3hj6arstuq35lsp80aee2fq9o 1qr7tl1vjjg7cf34btqilshvpk
of7kros5v8opsa06au48i0m530 8d1dirkmpg7nofnuh8ejmqnnac
g17vcjfr2tpmgkh5uq4toljil4 mgrnm8nucm3g9hsr8atcvsn3v0
62e8fuim75c4kjtdvld24hbfbo 0nj5rfp1c34sbrh7nbs69dd6d4
l3roqmk1nbpri0v66f459ferps u1jmgc82a034fkehpvv2rvktds
vnjholu57fri84495vsd78chi4 elv9l7tjqj52p512dkduiq59vg
rvk5nsad42s3dajee1lviihcvo 1vg6fn6hs8v4g5tmq71j9v13to
ijmccbrdc8b0q2ge23l5v5u5ao 7cpji9cvgbfpg8c8q5ovnunmhk
3ioiabemrba3744n2d2fk36734 qsc2qptp57jdqg946chhtm8f6o
7vhceucp5erlaahfm225ctq4ko l02k5g6qfd3jma1a9pmqgf97to
l8m04oa651osfgok3lioa9i8ks oc1n4ampnp19ncqfs0nlc3tg4g
lf1oupjl7pia2qop4ktlqrus1g rl80tptebhcefdeleuhaodkp0k
9l2ko9c727p91scgkmbqm7feco tvgo3cj0fb3edqpa2g81omre5s
3eh482jslqrsriqt45p8ruko9k 18ni3ob6288csa3hbanv80fbls
3miciorl7lf9ameu2ksc8gg458 8atop02sd72bah60tprgrneso0
sh9fagkv145h427h6550aj7880 k8toctefi94mpprdhck09s4p7k
gqlaa2coght9av0s35rsn4cloc
1vkn2n5pqb6linpditd74p46k0
783i7eaevfqprl683715cp5838
6ab8qtak4uabtbtlqkbsu3qk1c
7mre3p71d5fog18mu7v8hukj1s
oefjleqb9ei24mo56o9q07158s
3ea3irtagb734mmlgbih5efpac
flui24jqm2kf7rbqafdsjt6nq4
sa2niakqar83lkdksne0v8fsf4
5lq35nep1vht1vjfof65lfvqp4
7v67nb761n54lcrbjar2kr4gjg
kf2a8g2jjjqfn5osvdrob6rff0
519mg2q2qsbo64jkg2iittfd9o
ur22cfflgac1b218thugqeoohg
ef77l9nl2sugedov5gqv0qcc4g
23e36soc9la3ilrckarbj5eebc
oc38dod0cinsm2d2rnla4go5ps
lcmunns8nis9481lcmtks77r08
sbc02tfrlllop0cqrcm84pnl98
4q1d7k7rems0qrd2tt78e4i1uk
3ie36tl580hr44okllv43n06ck
c7gh52p46bovdb7ehfgjmqh1fs
4pc475uvgbpi729tj83q39qff0
220ckra8r8q1vcb7pm8qfgk6ek
th0dq9f2bmbbsuia0ppfo3ikn8
geeheeqrrm76k5fav2lfroe9rc
cf66eqe80stbg03jcq98jmp0mc
a12ka71un1brsmnclnsggcpi0k
uolu4u7o9bd5lcv1fvsns0vjc0
i1jjldv6kbg55jntnrd4n56d68
ffgo8r4p3ecq17hr014lkic554
o5kogv3uf7dk21hbjh1c18ht2c
896hcud52s49l8if3ql5ahhm9o
j7fkltdpcr3u6li228vdrkr10g
7s31goh9qf1epmf8h0nd3o95hg
obmebuajmjjneq76jr1gphigjk
9cbb6qj8c92pusudrdu3d769vc
7k9ru5ohshh8e6oq6q4g90hrr8
6glf11f71n05gn7er63sigb4bg
vhrg6c6h7fqc6jds7cal6ttn8s
5sf2cqe3b1d56nfe7b2fopm4j4
lk0kkp3s751nfldl70bbn6193k
sn8jdndhvpa02ck23mi8gtgdsk
iq225fp984rd2rom03avffacag
6oimdb88ptr4edqokfagcg3ll0
1suuefhjak7cgl671jh5tt17ks
t5usd3tjumr7t7dk5uatnd289k
f9gthgs8anll1pd1909leipc6o
nmjb3d7q015f7s6ige34c2f9kc
b5vg0a9flbu6sq07cndk0ktrvk
qki41d65rs2f3p9rg42o0l99lo
pdidra698i97opr3rfnvhiipdo
a9pgvueeuhgsrjibc6fr5th1m0
9fujf5f6omij0drm6t305hd2vg
9jvoal9db4n1fm8g5v533sioas
tf4arvjmnpu1v4gua8p6atq2m0
42q5b0qt2597g2s2s8vpo7ofvg
...@@ -3,6 +3,8 @@ from ortools.sat.python import cp_model ...@@ -3,6 +3,8 @@ from ortools.sat.python import cp_model
from ..gcalendar.cal_setup import get_calendar_service from ..gcalendar.cal_setup import get_calendar_service
from datetime import datetime, timedelta from datetime import datetime, timedelta
from googleapiclient import errors from googleapiclient import errors
from .schedule_objects import Course, Room, Professor
from .tagged_objects import ScheduleObject
class Schedule: class Schedule:
def __init__(self, courses, rooms, profs, days, hours): def __init__(self, courses, rooms, profs, days, hours):
...@@ -231,6 +233,8 @@ class Schedule: ...@@ -231,6 +233,8 @@ class Schedule:
## TODO Manually add these events ## TODO Manually add these events
#final_schedule.append(ScheduleObject(Course("MECH 402C 10", 20, "", 2, ["Th"], 4), Room("DANA115", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13")) #final_schedule.append(ScheduleObject(Course("MECH 402C 10", 20, "", 2, ["Th"], 4), Room("DANA115", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13"))
#final_schedule.append(ScheduleObject(Course("MECH 402C 11", 20, "", 2, ["Th"], 4), Room("DANA137", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13")) #final_schedule.append(ScheduleObject(Course("MECH 402C 11", 20, "", 2, ["Th"], 4), Room("DANA137", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13"))
self.create_event(Course("MECH 402C 10", 20, "", 2, ["Th"], 4), Room("DANA115", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13")
self.create_event(Course("MECH 402C 11", 20, "", 2, ["Th"], 4), Room("DANA137", 20, "", []), Professor("Senior Design Profs", 0, []), "Th", "13")
def print_schedule(self): def print_schedule(self):
status = self.solver.Solve(self.model) status = self.solver.Solve(self.model)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment