From 1431a5db5894219682ab6ec7240f6d8bd5f06727 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 23 Dec 2016 11:43:15 +0530
Subject: Remove the use of files in scilab evaluator

---
 yaksh/scilab_code_evaluator.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'yaksh/scilab_code_evaluator.py')

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index cc3c401..4584a06 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -16,7 +16,8 @@ class ScilabCodeEvaluator(BaseEvaluator):
     """Tests the Scilab code obtained from Code Server"""
     def __init__(self, metadata, test_case_data):
         self.files = []
-
+        self.submit_code_path = ""
+        self.test_code_path = ""
         # Set metadata values
         self.user_answer = metadata.get('user_answer')
         self.file_paths = metadata.get('file_paths')
@@ -28,23 +29,27 @@ class ScilabCodeEvaluator(BaseEvaluator):
 
     def teardown(self):
         # Delete the created file.
-        os.remove(self.submit_code_path)
+        if os.path.exists(self.submit_code_path):
+            os.remove(self.submit_code_path)
+        if os.path.exists(self.test_code_path):
+            os.remove(self.test_code_path)
         if self.files:
             delete_files(self.files)
 
     def check_code(self):
         self.submit_code_path = self.create_submit_code_file('function.sci')
+        self.test_code_path = self.create_submit_code_file('main.sci')
         if self.file_paths:
             self.files = copy_files(self.file_paths)
         ref_code_path = self.test_case
-        clean_ref_path, clean_test_case_path = \
-            self._set_test_code_file_path(ref_code_path)
+        clean_ref_path, clean_test_case_path = self.test_code_path, None
         self.user_answer, terminate_commands = \
             self._remove_scilab_exit(self.user_answer.lstrip())
 
         success = False
         test_case_weight = 0.0
         self.write_to_submit_code_file(self.submit_code_path, self.user_answer)
+        self.write_to_submit_code_file(self.test_code_path, self.test_case)
         # Throw message if there are commmands that terminates scilab
         add_err = ""
         if terminate_commands:
-- 
cgit 


From b617a0279a486ca4d98a2ca55d2f4d0fcf56e5e2 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Tue, 27 Dec 2016 15:52:07 +0530
Subject: Add floating point mark_weight to control test case weightage

---
 yaksh/scilab_code_evaluator.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'yaksh/scilab_code_evaluator.py')

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index bf16c84..7d54e8b 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -43,7 +43,7 @@ class ScilabCodeEvaluator(BaseEvaluator):
             self._remove_scilab_exit(self.user_answer.lstrip())
 
         success = False
-        test_case_weight = 0.0
+        mark_fraction = 0.0
         self.write_to_submit_code_file(self.submit_code_path, self.user_answer)
         # Throw message if there are commmands that terminates scilab
         add_err = ""
@@ -70,13 +70,13 @@ class ScilabCodeEvaluator(BaseEvaluator):
             stdout = self._strip_output(stdout)
             if proc.returncode == 5:
                 success, err = True, None
-                test_case_weight = float(self.weight) if self.partial_grading else 0.0
+                mark_fraction = 1.0 if self.partial_grading else 0.0
             else:
                 err = add_err + stdout
         else:
             err = add_err + stderr
 
-        return success, err, test_case_weight
+        return success, err, mark_fraction
 
     def _remove_scilab_exit(self, string):
         """
-- 
cgit