Merge branch 'master' of 192.168.15.97:codeq-problems

4 files changed, 118 insertions, 0 deletions

diff --git a/robot/problems/introduction/spotturn90/common.py b/robot/problems/introduction/spotturn90/common.py
new file mode 100644
index 0000000..39e9148
--- /dev/null
+++ b/robot/problems/introduction/spotturn90/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 = 214
+group = 'introduction'
+number = 3
+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_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.9 )
+'''
+
+hint_type = {
+    'mW_init': Hint('mW_init'),
+    'connectMotorLeft': Hint('connectMotorLeft'),
+    'connectMotorRight': Hint('connectMotorRight'),
+    'moveTank': Hint('moveTank'),
+    'onForSeconds': Hint('onForSeconds'),
+    'lrPower': Hint('lrPower'),
+    'seconds': Hint('seconds'),
+}
+
+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_tank']):
+        return [{'id': 'moveTank'}]
+
+    if not 'on_for_seconds' in code:
+        return [{'id': 'onForSeconds'}]
+    
+    if not 'seconds' in code:
+        return [{'id': 'seconds'}]
+    
+    if not 'lr_power' in code:
+        return [{'id': 'lrPower'}]
+    
+    return None
diff --git a/robot/problems/introduction/spotturn90/en.py b/robot/problems/introduction/spotturn90/en.py
new file mode 100644
index 0000000..348c517
--- /dev/null
+++ b/robot/problems/introduction/spotturn90/en.py
@@ -0,0 +1,14 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'en')
+
+id = 214
+name = 'Turn on spot 90'
+slug = 'Turn on spot 90'
+
+description = '''\
+'''
+
+hint = {
+    
+}
diff --git a/robot/problems/introduction/spotturn90/naloga03_turnOnSpotRight90.py b/robot/problems/introduction/spotturn90/naloga03_turnOnSpotRight90.py
new file mode 100644
index 0000000..033290b
--- /dev/null
+++ b/robot/problems/introduction/spotturn90/naloga03_turnOnSpotRight90.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+print ("Robot naj se na mestu obrne za 90 stopinj v desno.")
+import sys
+sys.path.append('/home/user/codeq')
+import time
+from ev3dev import *
+from mindstorms_widgets import mindstorms_widgets
+
+robot = mindstorms_widgets()
+robot.connect_motor( 'left' )
+robot.connect_motor( 'right' )
+
+# Solution 1:
+#robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.9 )
+ 
+# Solution 2:
+robot.motor['left'].position = 0
+robot.motor['right'].position = 0
+while robot.motor['left'].position <180 or robot.motor['right'].position <180:
+    robot.large_motor( 'left', 'on', power=10 )
+    robot.large_motor( 'right', 'on', power=10 , invert=True)
+    #print robot.motor['left'].position, robot.motor['right'].position
diff --git a/robot/problems/introduction/spotturn90/sl.py b/robot/problems/introduction/spotturn90/sl.py
new file mode 100644
index 0000000..fe477aa
--- /dev/null
+++ b/robot/problems/introduction/spotturn90/sl.py
@@ -0,0 +1,21 @@
+# coding=utf-8
+
+name = 'Obrat na mestu 90'
+slug = 'Obrat na mestu 90'
+
+description = '''\
+<p>Robot naj se na mestu obrne za 90 stopinj v desno.</p>'''
+
+hint = {
+    'mW_init':['''<p>Robota v programu predstavimo z mindstorms_widgets(): <code>robot = mindstorms_widgets()</code>.</p>'''],
+    'connectMotorLeft':['''<p>Robotu moramo priključiti levi motor: <code>robot.connect_motor( 'left' )</code>.</p>'''],
+    'connectMotorRight':['''<p>Robotu moramo priključiti desni motor: <code>robot.connect_motor( 'right' )</code>.</p>'''],
+    'moveTank':['''<p>Robot naj se obrne na mestu.</p>''',
+                 '''<p>Najprimernejša metoda za to je <code>move_tank</code></p>'''],
+    'onForSeconds':['''<p>Prvi argument metode <code>robot.move_tank</code> naj pove, da bo delovanje motorjev časovno omejeno.</p>''',
+                    '''<p><code>robot.move_tank('on_for_seconds', ... )</code>.</p>'''],
+    'lrPower':['''<p>Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.</p>''',
+               '''<p><code>robot.move_tank( 'on_for_seconds', lr_power=[hitrost, -hitrost], ... )</code>.</p>'''],
+    'seconds':['''<p>Napiši časovno omejitev v sekundah.</p>''',
+               '''<p><code>robot.move_tank( 'on_for_seconds', ..., seconds=... )</code>.</p>'''],
+}