Merge branch 'master' of 192.168.15.97:codeq-problems

4 files changed, 156 insertions, 0 deletions

diff --git a/robot/problems/introduction/countlines/common.py b/robot/problems/introduction/countlines/common.py
new file mode 100644
index 0000000..29f5383
--- /dev/null
+++ b/robot/problems/introduction/countlines/common.py
@@ -0,0 +1,79 @@
+# 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 = 206
+group = 'introduction'
+number = 10
+visible = True
+
+solution = '''\
+import time
+from ev3dev import *
+from mindstorms_widgets import mindstorms_widgets
+
+color_table = ['none', 'black', 'blue', 'green', 'yellow', 'red', 'white', 'brown']
+
+robot = mindstorms_widgets()
+robot.connect_motor( 'left' )
+robot.connect_motor( 'right' )
+robot.connect_sensor( 'color' )
+
+robot.move_steering( 'on' )
+start = time.time()
+stevec = 0
+color = -1
+while time.time()-start < 2.1:
+    c = robot.color_sensor_measure( 'color' ) # values: 0-7 see the scale above
+    if c!=color:
+        if c!=6 and c!=0:
+            stevec += 1
+        color = c
+robot.move_steering( 'off' )
+print( "Stevilo crt:", stevec )
+'''
+
+hint_type = {
+    'mW_init': Hint('mW_init'),
+    'connectMotorLeft': Hint('connectMotorLeft'),
+    'connectMotorRight': Hint('connectMotorRight'),
+    'moveSteeringOn': Hint('moveSteeringOn'),
+    'moveSteeringOff': Hint('moveSteeringOff'),
+    'connectColorSensor': Hint('connectColorSensor'),
+    'colorSensorMeasure': Hint('colorSensorMeasure'),
+    'while': Hint('while')
+}
+
+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, ['connect_sensor', '(' ]) and 'color' in code):
+        return [{'id': 'connectColorSensor'}]
+
+    if not (has_token_sequence(tokens, ['move_steering', '(']) and 'on' in code):
+        return [{'id': 'moveSteeringOn'}]
+
+    if not (has_token_sequence(tokens, ['move_steering', '(']) and 'off' in code):
+        return [{'id': 'moveSteeringOff'}]
+
+    if not (has_token_sequence(tokens, ['color_sensor_measure', '(']) and 'color' in code):
+        return [{'id': 'colorSensorMeasure'}]
+    
+    if not has_token_sequence(tokens, ['while']):
+        return [{'id': 'while'}]
+
+    return None
diff --git a/robot/problems/introduction/countlines/en.py b/robot/problems/introduction/countlines/en.py
new file mode 100644
index 0000000..8b3b275
--- /dev/null
+++ b/robot/problems/introduction/countlines/en.py
@@ -0,0 +1,14 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'en')
+
+id = 206
+name = 'Count lines'
+slug = 'Count lines'
+
+description = '''\
+'''
+
+hint = {
+    
+}
diff --git a/robot/problems/introduction/countlines/naloga10_countLines.py b/robot/problems/introduction/countlines/naloga10_countLines.py
new file mode 100644
index 0000000..d1a8326
--- /dev/null
+++ b/robot/problems/introduction/countlines/naloga10_countLines.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+# coding=utf-8
+
+print """
+Naloga 10:
+   Robot naj se pelje naravnost, pravokotno na crte in naj jih presteje.
+"""
+
+import time
+from ev3dev import *
+from mindstorms_widgets import mindstorms_widgets
+
+color_table = ['none', 'black', 'blue', 'green', 'yellow', 'red', 'white', 'brown']
+
+cs     = color_sensor()
+assert cs.connected
+cs.mode = 'COL-COLOR' # values: 0-7 see the scale above
+
+robot = mindstorms_widgets()
+robot.connect_motor( 'left' )
+robot.connect_motor( 'right' )
+
+power = 30
+
+robot.move_tank( 'on', lr_power=[power,power])
+start = time.time()
+stevec = 0
+color = -1
+while time.time()-start < 2.1:
+    c = cs.value()
+    if c!=color:
+        print c, color_table[c]
+        if c!=6 and c!=0:
+            stevec += 1
+        color = c
+robot.move_tank( 'off', brake_at_end=True )
+print "Stevilo crt:", stevec
\ No newline at end of file
diff --git a/robot/problems/introduction/countlines/sl.py b/robot/problems/introduction/countlines/sl.py
new file mode 100644
index 0000000..4e1c3d4
--- /dev/null
+++ b/robot/problems/introduction/countlines/sl.py
@@ -0,0 +1,26 @@
+# coding=utf-8
+
+name = 'Preštej črte'
+slug = 'Preštej črte'
+
+description = '''\
+<p>Robot naj pelje naravnost, pravokotno na črte in naj jih prešteje.</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>'''],
+    'moveSteeringOn':['''<p>Sinhroniziraj motorja in ju zaženi.</p>''',
+                    '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( 'on' )</code>.</p>'''],
+    'moveSteeringOff':['''<p>Ustavi motorja.</p>''',
+                    '''<p><code>robot.move_steering( 'off' )</code>.</p>'''],
+    'connectColorSensor':['''<p>Robotu moramo priključiti barvni senzor.</p>''',
+                    '''<p><code>robot.connect_sensor( 'color' )</code>.</p>'''],
+    'colorSensorMeasure':['''<p>Medtem ko se robot pomika naprej, naj uporabi barvni senzor v načinu 'color', s katerim pove, katero barvo trenutno vidi.</p>''',
+                    '''<p><code>robot.color_sensor_measure( 'color' )</code>.</p>'''],
+    'while':['''<p>Uporabi zanko, znotraj katere robot odčitava barve in povečuje števec.</p>''',
+             '''<p>Zanka je lahko časovno omejena, npr. z uporabo metode <code>time.time()</code>.</p>''',
+             '''<p><code>while time.time()-start < 1.1:</code>.</p>'''],
+}