diff options
author | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-13 13:00:05 +0200 |
---|---|---|
committer | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-13 13:00:05 +0200 |
commit | a86a6ca92d315dedf3ce4d5035a4c38178f8b531 (patch) | |
tree | 96ae9beb094aa8bfa74d69a0878349107e900b04 /robot/problems/introduction/countlines | |
parent | 1e5d42ba53ea0c631dbc6f21887839c91571ebca (diff) |
Remove backup files and add *~ to .gitignore
Diffstat (limited to 'robot/problems/introduction/countlines')
-rw-r--r-- | robot/problems/introduction/countlines/common.py~ | 79 | ||||
-rw-r--r-- | robot/problems/introduction/countlines/sl.py~ | 29 |
2 files changed, 0 insertions, 108 deletions
diff --git a/robot/problems/introduction/countlines/common.py~ b/robot/problems/introduction/countlines/common.py~ deleted file mode 100644 index 6e5d135..0000000 --- a/robot/problems/introduction/countlines/common.py~ +++ /dev/null @@ -1,79 +0,0 @@ -# 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', '(', 'on', ')']): - return [{'id': 'moveSteeringOn'}] - - if not has_token_sequence(tokens, ['move_steering', '(', 'off', ')']): - 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/sl.py~ b/robot/problems/introduction/countlines/sl.py~ deleted file mode 100644 index 6b759ad..0000000 --- a/robot/problems/introduction/countlines/sl.py~ +++ /dev/null @@ -1,29 +0,0 @@ -# coding=utf-8 -import server -mod = server.problems.load_language('python', 'sl') - -id = 206 -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>'''], -} |