summaryrefslogtreecommitdiff
path: root/robot/problems/introduction/spotturn90
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-10-13 13:00:05 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-10-13 13:00:05 +0200
commita86a6ca92d315dedf3ce4d5035a4c38178f8b531 (patch)
tree96ae9beb094aa8bfa74d69a0878349107e900b04 /robot/problems/introduction/spotturn90
parent1e5d42ba53ea0c631dbc6f21887839c91571ebca (diff)
Remove backup files and add *~ to .gitignore
Diffstat (limited to 'robot/problems/introduction/spotturn90')
-rw-r--r--robot/problems/introduction/spotturn90/common.py~61
-rw-r--r--robot/problems/introduction/spotturn90/sl.py~24
2 files changed, 0 insertions, 85 deletions
diff --git a/robot/problems/introduction/spotturn90/common.py~ b/robot/problems/introduction/spotturn90/common.py~
deleted file mode 100644
index d024bd4..0000000
--- a/robot/problems/introduction/spotturn90/common.py~
+++ /dev/null
@@ -1,61 +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 = 214
-group = 'introduction'
-number = 3
-visible = True
-
-solution = '''\
-import time
-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 has_token_sequence(tokens, ['on_for_seconds']):
- return [{'id': 'onForSeconds'}]
-
- if not has_token_sequence(tokens, ['lr_power']):
- return [{'id': 'lrPower'}]
-
- if not has_token_sequence(tokens, ['seconds']):
- return [{'id': 'seconds'}]
-
- return None
diff --git a/robot/problems/introduction/spotturn90/sl.py~ b/robot/problems/introduction/spotturn90/sl.py~
deleted file mode 100644
index bc0978c..0000000
--- a/robot/problems/introduction/spotturn90/sl.py~
+++ /dev/null
@@ -1,24 +0,0 @@
-# coding=utf-8
-import server
-mod = server.problems.load_language('python', 'sl')
-
-id = 214
-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>'''],
-} \ No newline at end of file