From b614927f02964608663c01f3062ffb6a0fb07445 Mon Sep 17 00:00:00 2001
From: KanonKC <kanonkce@gmail.com>
Date: Mon, 29 Jan 2024 23:54:30 +0700
Subject: [PATCH] Update prediction model

---
 api/controllers/problem/update_problem.py        |   6 +++---
 .../difficulty_predictor_667.sav                 | Bin 0 -> 1946 bytes
 api/difficulty_predictor/predictor.py            |   2 +-
 api/views/script.py                              |  12 +++++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 api/difficulty_predictor/difficulty_predictor_667.sav

diff --git a/api/controllers/problem/update_problem.py b/api/controllers/problem/update_problem.py
index cd4a1a5..ea8468b 100644
--- a/api/controllers/problem/update_problem.py
+++ b/api/controllers/problem/update_problem.py
@@ -1,7 +1,7 @@
 from api.utility import passwordEncryption
 from rest_framework.response import Response
 from rest_framework.decorators import api_view
-from api.sandbox.grader import PythonGrader
+from api.sandbox.grader import Grader
 from ...constant import GET,POST,PUT,DELETE
 from ...models import *
 from rest_framework import status
@@ -27,7 +27,7 @@ def update_problem(problem:Problem,request):
     problem.updated_date = timezone.now()
 
     if 'testcases' in request.data:
-        running_result = PythonGrader(problem.solution,request.data['testcases'],1,1.5).generate_output()
+        running_result = Grader[request.data['language']](problem.solution,request.data['testcases'],1,1.5).generate_output()
 
         # if not running_result.runnable:
         #     return Response({'detail': 'Error during editing. Your code may has an error/timeout!'},status=status.HTTP_406_NOT_ACCEPTABLE)
@@ -53,7 +53,7 @@ def update_problem(problem:Problem,request):
     if 'solution' in request.data:
         testcases = Testcase.objects.filter(problem=problem,deprecated=False)
         program_input = [i.input for i in testcases]
-        running_result = PythonGrader(problem.solution,program_input,1,1.5).generate_output()
+        running_result = Grader[request.data['language']](problem.solution,program_input,1,1.5).generate_output()
 
         if not running_result.runnable:
             return Response({'detail': 'Error during editing. Your code may has an error/timeout!'},status=status.HTTP_406_NOT_ACCEPTABLE)
diff --git a/api/difficulty_predictor/difficulty_predictor_667.sav b/api/difficulty_predictor/difficulty_predictor_667.sav
new file mode 100644
index 0000000000000000000000000000000000000000..764ed753b3abb8698bb9d70e23e95ea949f68517
GIT binary patch
literal 1946
zcmZ`)TWB0r7@pl^H;HM|Y)vp$jj4thFDxc4#Y?G&Bx23TR!b<N=wWvEZ02NlXV#fB
zxu`7(C5<6RYRnN-1o1^B(ig!?6jXc>K|zvQqE!?X6nrW4%@_U8>_545<AL38zVn~+
z&wrnp`d7|17~zr!{9=h&o|ASMAG5Qr=cj3|WcfZX@SG*M>nPc7W+LGbikPRC)$OzD
zl<Jes4&A)0%!EvOR-OmG%E%_GH0F9-*kvW_tw6X+Ho@Bp)aTDKWp>GAnF){QV7ttn
zqC4pqxsol_O<J)$tE|<;D$0z@q(jHutmX}q+8p64*$_Cq;Ci4wRbZ9~JVqU>%zVln
zs$_=~lq=Keoa?c4IVcHkd7d?`<R0p=oa^|)3vvSdkcsdhsB`kwBg@J(=G0IutLD`S
z)n~@c_?)skWFjx7D@<RBAHPQ}yik?a$=LHMlgW(y3oHCH9}p_L@Dv2+W@}=M7P#jN
z@W=OAo(fl3C29%5$`$Ry{@N3~%xC~-6$3T0)uHHI)h~!evm1y?AbdKIr)ohqh8Y95
zmECS%r%ku7j|{H^(k0`3hq*_tGS|@N4t2(=MPbAd>kySTBTlDxQQv{;4{b%m9@rU+
zs`62-ODondiGI;u^g_+GEIOw#l5KyE3=IwIWQ79D2|mH-j>@4>oibG;gkobsuEg`q
zg4%9|<OqGwcJojGMaYlGn3BnG|MA^CHsfc*kQTOubXT7TAC2rZ?j{%Cxp8@LeVu?u
zuzJZ-`tbP+U#*ak8pjCr4{+~?50Lkg!e?jRydiZ7`5k27=r>P)ySh>3Uz{M{<<y^x
ziJz)`<`~%+`Ky(FbQ#a5Ny|TLm&`Y=pnQ<5p1yGJ!&g>OeuyNV>B>y~@e=ZW^7-u7
zFMj#*tH|#n_QcOm&aeE4yocPs@_P4gr_LkqC5gA!KY8u%Pm!ldYO!--X6CKU`-$=X
zsg1+4oASC3&!qMie?>k_dOluy|KcNSRZgBDM=lTFI&<ImC_hMMk1pNz*qx}4oFrq5
zW9Ndw_ehv>XbImcS4vRwI(^E7*2Ki^-({d}Wz}Jm$Ft+m!1kz2n!}?y*UM^7H@Q7h
z+dR6u`xl1ZHE>1wjA}A!kb0CS5R-^FWsOGUO^DYZHY4sqY(Z>A+>6+Tm_po#cr9W(
zq7F{27qPHM>rNgV*w&=CWcp+i&reZbSe}5=*U!w+O~8Gsr!+JHPI95=ylvb4rU9kT
z0UH6w0owqJcE;>Hs{*qd=44wqNxIP<qXQqJz^w_j@0aP{!z|Vs8rOq%UfG$2A=J=A
zcGMBnNmSR`RkI5&#7x6X!tb=aDN22H48WHx&tdK&19!Hv|C~%c7!848IAl4ws1P0^
wXmhQ7I*?#nluhG*!fnPNDp#MISJ{jnqiqzeq!Y~Z!|!XNKRu8hP(e2RA9np#k^lez

literal 0
HcmV?d00001

diff --git a/api/difficulty_predictor/predictor.py b/api/difficulty_predictor/predictor.py
index 732ac9e..5a68bad 100644
--- a/api/difficulty_predictor/predictor.py
+++ b/api/difficulty_predictor/predictor.py
@@ -2,7 +2,7 @@
 
 # Read sav
 
-with open('./api/difficulty_predictor/difficulty_predictor.sav', 'rb') as f:
+with open('./api/difficulty_predictor/difficulty_predictor_667.sav', 'rb') as f:
     difficulty = pickle.load(f)
 
 # Predict some model
diff --git a/api/views/script.py b/api/views/script.py
index e871e9e..b2b2741 100644
--- a/api/views/script.py
+++ b/api/views/script.py
@@ -66,10 +66,20 @@
 #         problem.save()
 #     return Response({'message': 'Success!'},status=status.HTTP_201_CREATED)
 
+# @api_view([POST])
+# def run_script(request):
+#     problems = Problem.objects.all()
+#     for problem in problems:
+#         update_problem_difficulty(problem)
+
+#     return Response({'message': 'Success!'},status=status.HTTP_201_CREATED)
+
 @api_view([POST])
 def run_script(request):
     problems = Problem.objects.all()
     for problem in problems:
-        update_problem_difficulty(problem)
+        if problem.language == "py":
+            problem.language = "python"
+            problem.save()
 
     return Response({'message': 'Success!'},status=status.HTTP_201_CREATED)