summaryrefslogtreecommitdiff
path: root/robot/problems/introduction/gyro90
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/gyro90
parent1e5d42ba53ea0c631dbc6f21887839c91571ebca (diff)
Remove backup files and add *~ to .gitignore
Diffstat (limited to 'robot/problems/introduction/gyro90')
-rw-r--r--robot/problems/introduction/gyro90/common.py~80
-rw-r--r--robot/problems/introduction/gyro90/naloga07_gyro90.py~34
-rw-r--r--robot/problems/introduction/gyro90/sl.py~32
3 files changed, 0 insertions, 146 deletions
diff --git a/robot/problems/introduction/gyro90/common.py~ b/robot/problems/introduction/gyro90/common.py~
deleted file mode 100644
index c02a2c4..0000000
--- a/robot/problems/introduction/gyro90/common.py~
+++ /dev/null
@@ -1,80 +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 = 209
-group = 'introduction'
-number = 7
-visible = True
-
-solution = '''\
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
-
-robot = mindstorms_widgets()
-robot.connect_motor( 'left' )
-robot.connect_motor( 'right' )
-robot.connect_sensor( 'gyro' )
-
-robot.gyro_set_mode( 'angle' )
-robot.reset_gyro()
-
-power = 15
-robot.move_tank( 'on', lr_power=[power,-power] )
-while robot.gyro_sensor_measure() < 90:
- pass
-robot.move_tank( 'off' )
-'''
-
-hint_type = {
- 'mW_init': Hint('mW_init'),
- 'connectMotorLeft': Hint('connectMotorLeft'),
- 'connectMotorRight': Hint('connectMotorRight'),
- 'connectGyro': Hint('connectGyro'),
- 'resetGyro': Hint('resetGyro'),
- 'setGyroMode': Hint('setGyroMode'),
- 'gyroMeasure': Hint('gyroMeasure'),
- 'moveTank': Hint('moveTank'),
- 'lrPower': Hint('lrPower'),
- '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_gyro','(', 'gyro', ')']):
- return [{'id': 'connectGyro'}]
-
- if not has_token_sequence(tokens, ['reset_gyro()']):
- return [{'id': 'resetGyro'}]
-
- if not has_token_sequence(tokens, ['gyro_set_mode']):
- return [{'id': 'setGyroMode'}]
-
- if not has_token_sequence(tokens, ['gyro_sensor_measure()']):
- return [{'id': 'gyroMeasure'}]
-
- if not has_token_sequence(tokens, ['move_tank']):
- return [{'id': 'moveTank'}]
-
- if not has_token_sequence(tokens, ['lr_power']):
- return [{'id': 'lrPower'}]
-
- if not has_token_sequence(tokens, ['while']):
- return [{'id': 'while'}]
-
- return None
diff --git a/robot/problems/introduction/gyro90/naloga07_gyro90.py~ b/robot/problems/introduction/gyro90/naloga07_gyro90.py~
deleted file mode 100644
index 97e42ee..0000000
--- a/robot/problems/introduction/gyro90/naloga07_gyro90.py~
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python
-# coding=utf-8
-
-print """
-Naloga 7:
- Robot naj se na mestu obrne za 90 stopinj v desno; pri tem naj si pomaga z ziroskopom.
-"""
-
-import time
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
-
-gs = gyro_sensor();
-assert gs.connected
-gs.mode = 'GYRO-ANG' # Angle (degrees), value: (-32768 to 32767)
-
-# for m in us.modes:
-# print "\t",m
-#exit()
-robot = mindstorms_widgets()
-robot.connect_motor( 'left' )
-robot.connect_motor( 'right' )
-
-power = 15
-robot.move_tank( 'on', lr_power=[power,-power] )
-while gs.value()<90:
- pass
-robot.move_tank( 'off', brake_at_end=True )
-# print gs.value()
-# gs = gyro_sensor();
-# assert gs.connected
-# gs.mode = 'GYRO-ANG'
-#
-# print "--->",gs.value() \ No newline at end of file
diff --git a/robot/problems/introduction/gyro90/sl.py~ b/robot/problems/introduction/gyro90/sl.py~
deleted file mode 100644
index 76939f7..0000000
--- a/robot/problems/introduction/gyro90/sl.py~
+++ /dev/null
@@ -1,32 +0,0 @@
-# coding=utf-8
-import server
-mod = server.problems.load_language('python', 'sl')
-
-id = 209
-name = 'Žiroskop 90'
-slug = 'Žiroskop 90'
-
-description = '''\
-<p>Robot naj se na mestu obrne za 90 stopinj v desno; pri tem naj si pomaga z žiroskopom.</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>'''],
- 'connectGyro':['''<p>Robotu priključi žiroskop.</p>''',
- '''<p><code>robot.connect_sensor( 'gyro' )</code>.</p>'''],
- 'resetGyro':['''<p>Žiroskop na začetku resetiraj.</p>''',
- '''<p><code>robot.reset_gyro()</code>.</p>'''],
- 'setGyroMode':['''<p>Žiroskopu nastavi način delovanja na merjenje kotov.</p>''',
- '''<p><code>robot.gyro_set_mode('angle')</code>.</p>'''],
- 'gyroMeasure':['''<p>Preberi vrednost žiroskopa.</p>''',
- '''<p><code>robot.gyro_sensor_measure()</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', lr_power=[hitrost, -hitrost], ... )</code>.</p>'''],
- 'moveTank':['''<p>Robot naj se obrne na mestu.</p>''',
- '''<p>Najprimernejša metoda za to je <code>move_tank</code></p>'''],
- 'while':['''<p>Program naj teče dokler je kot zasuka manjši od 90 stopinj.</p>''',
- '''<p><code>robot.gyro_sensor_measure() < 90:</code></p>'''],
-} \ No newline at end of file