From 1d76fa281546f40b8bae396f6892c927ed331314 Mon Sep 17 00:00:00 2001
From: Zhichao <liuzceecs@gmail.com>
Date: Fri, 18 Oct 2019 23:19:17 -0400
Subject: [PATCH] fix grading
---
grading.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grading.py b/grading.py
index bf5aec3..1c8d578 100644
--- a/grading.py
+++ b/grading.py
@@ -1,5 +1,5 @@
from pyspark import SparkContext
-from functions import *
+from correct_functions import *
import re
import sys
@@ -36,7 +36,7 @@ if taskno == 4 or taskno == -1:
#### Task 4
logsRDD = sc.textFile("datafiles/NASA_logs_sample.txt")
print "=========================== Task 4"
- task4_result = task4(logsRDD, ['02/Jul/1995', '03/Jul/1995', '04/Jul/1995', '05/Jul/1995', '06/Jul/1995'])
+ task4_result = task4(logsRDD)
for x in task4_result.takeOrdered(100):
print x.encode('utf-8')
@@ -53,12 +53,12 @@ if taskno == 6 or taskno == -1:
#### Task 6
print "=========================== Task 6"
logsRDD = sc.textFile("datafiles/NASA_logs_sample.txt")
- task6_result = task6(logsRDD, '03/Jul/1995', '05/Jul/1995')
+ task6_result = task6(logsRDD, '00:01:00', '00:03:00')
for x in task6_result.takeOrdered(100):
print x
if taskno == 7 or taskno == -1:
- #### Task 7
+ #### Task 9
print "=========================== Task 7"
nobelRDD = sc.textFile("datafiles/prize.json")
task7_result = task7(nobelRDD)
--
GitLab