summaryrefslogtreecommitdiff
path: root/robot/problems/introduction/forward1m
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/forward1m
parent1e5d42ba53ea0c631dbc6f21887839c91571ebca (diff)
Remove backup files and add *~ to .gitignore
Diffstat (limited to 'robot/problems/introduction/forward1m')
-rw-r--r--robot/problems/introduction/forward1m/common.py~61
-rw-r--r--robot/problems/introduction/forward1m/sl.py~24
2 files changed, 0 insertions, 85 deletions
diff --git a/robot/problems/introduction/forward1m/common.py~ b/robot/problems/introduction/forward1m/common.py~
deleted file mode 100644
index 809fe9d..0000000
--- a/robot/problems/introduction/forward1m/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 = 208
-group = 'introduction'
-number = 2
-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_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 has_token_sequence(tokens, ['on_for_rotations']):
- return [{'id': 'onForRotations'}]
-
- if not has_token_sequence(tokens, ['direction']):
- return [{'id': 'direction'}]
-
- if not has_token_sequence(tokens, ['rotations']):
- return [{'id': 'rotations'}]
-
- return None
diff --git a/robot/problems/introduction/forward1m/sl.py~ b/robot/problems/introduction/forward1m/sl.py~
deleted file mode 100644
index e8071ee..0000000
--- a/robot/problems/introduction/forward1m/sl.py~
+++ /dev/null
@@ -1,24 +0,0 @@
-# coding=utf-8
-import server
-mod = server.problems.load_language('python', 'sl')
-
-id = 208
-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 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>'''],
- '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>'''],
-}