Merge branch 'master' of 192.168.15.97:codeq-problems

3 files changed, 98 insertions, 0 deletions

diff --git a/robot/problems/introduction/forward1m/common.py b/robot/problems/introduction/forward1m/common.py
new file mode 100644
index 0000000..ea2f7a0
--- /dev/null
+++ b/robot/problems/introduction/forward1m/common.py
@@ -0,0 +1,60 @@
+# coding=utf-8
+
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
+from server.hints import Hint, HintSequence
+
+id = 208
+group = 'introduction'
+number = 2
+visible = True
+
+solution = '''\
+from ev3dev import *
+from mindstorms_widgets import mindstorms_widgets
+
+robot = mindstorms_widgets()
+robot.connect_motor( 'left' )
+robot.connect_motor( 'right' )
+
+robot.move_steering( 'on_for_rotations', direction=0, rotations=5.71 )
+'''
+
+hint_type = {
+    'mW_init': Hint('mW_init'),
+    'connectMotorLeft': Hint('connectMotorLeft'),
+    'connectMotorRight': Hint('connectMotorRight'),
+    'moveSteering': Hint('moveSteering'),
+    'onForRotations': Hint('onForRotations'),
+    'direction': Hint('direction'),
+    'rotations': Hint('rotations'),
+}
+
+def hint(code):
+    tokens = get_tokens(code)
+
+    # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program
+    if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']):
+        return [{'id': 'mW_init'}]
+
+    # if code does not include connect_motor statement, a student needs to learn about how to connect the motors
+    if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']):
+        return [{'id': 'connectMotorLeft'}]
+
+    # if code does not include connect_motor statement, a student needs to learn about how to connect the motors
+    if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']):
+        return [{'id': 'connectMotorRight'}]
+
+    if not has_token_sequence(tokens, ['move_steering']):
+        return [{'id': 'moveSteering'}]
+
+    if not 'on_for_rotations' in code:
+        return [{'id': 'onForRotations'}]
+    
+    if not 'direction' in code:
+        return [{'id': 'direction'}]
+    
+    if not 'rotations' in code:
+        return [{'id': 'rotations'}]
+
+    return None
diff --git a/robot/problems/introduction/forward1m/en.py b/robot/problems/introduction/forward1m/en.py
new file mode 100644
index 0000000..bdf2a45
--- /dev/null
+++ b/robot/problems/introduction/forward1m/en.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'en')
+
+id = 208
+name = 'Forward 1m'
+slug = 'Forward 1m'
+
+description = '''\
+
+'''
+
+hint = {
+    
+}
diff --git a/robot/problems/introduction/forward1m/sl.py b/robot/problems/introduction/forward1m/sl.py
new file mode 100644
index 0000000..8045d58
--- /dev/null
+++ b/robot/problems/introduction/forward1m/sl.py
@@ -0,0 +1,23 @@
+# coding=utf-8
+
+name = 'Naprej 1m'
+slug = 'Naprej 1m'
+
+description = '''\
+<p>Napiši program, da bo robot peljal naravnost naprej 3 sekunde in se nato ustavil.</p>'''
+
+hint = {
+    'mW_init':['''<p>Robota v programu predstavimo z mindstorms_widgets(): <code>robot = mindstorms_widgets()</code>.</p>'''],
+    'connectMotorLeft':['''<p>Robotu priključi levi motor</p>''',
+                 '''<p><code>robot.connect_motor( 'left' )</code>.</p>'''],
+    'connectMotorRight':['''<p>Robotu priključi desni motor</p>''',
+                 '''<p><code>robot.connect_motor( 'right' )</code>.</p>'''],
+    'moveSteering':['''<p>Sinhroniziraj motorja in ju zaženi za 3 sekunde.</p>''',
+                    '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( ... )</code>.</p>'''],
+    'onForRotations':['''<p>Prvi argument metode <code>robot.move_steering</code> naj pove, da bo delovanje motorjev določeno s številom obratov.</p>''',
+                    '''<p><code>robot.move_steering('on_for_rotations', ... )</code>.</p>'''],
+    'direction':['''<p>Navedi smer premikanja motorjev, naravnost = 0.</p>''',
+                    '''<p><code>robot.move_steering( 'on_for_rotations', direction=0, ... )</code>.</p>'''],
+    'rotations':['''<p>Določi število obratov; za koliko obratov naj se zavrtita motorja? Izmeri dolžino 1m, izpisuj obrate <code>print(robot.motor['left'].count_per_rot, robot.motor['right'].count_per_rot)</code> in tako določi ustrezno število obratov.</p>''',
+                    '''<p><code>robot.move_steering( 'on_for_rotations', direction=0, rotations=5 )</code>.</p>'''],
+}