From a86a6ca92d315dedf3ce4d5035a4c38178f8b531 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 13 Oct 2015 13:00:05 +0200 Subject: Remove backup files and add *~ to .gitignore --- robot/problems/introduction/gyrosquare/common.py~ | 103 ---------------------- robot/problems/introduction/gyrosquare/sl.py~ | 40 --------- 2 files changed, 143 deletions(-) delete mode 100644 robot/problems/introduction/gyrosquare/common.py~ delete mode 100644 robot/problems/introduction/gyrosquare/sl.py~ (limited to 'robot/problems/introduction/gyrosquare') diff --git a/robot/problems/introduction/gyrosquare/common.py~ b/robot/problems/introduction/gyrosquare/common.py~ deleted file mode 100644 index 1c31f92..0000000 --- a/robot/problems/introduction/gyrosquare/common.py~ +++ /dev/null @@ -1,103 +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 = 210 -group = 'introduction' -number = 8 -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 = 20 -def forward_and_turnRight(power, angle): - robot.move_steering( 'on_for_seconds', direction=0, power=power, seconds=2 ) - robot.move_tank( 'on', lr_power=[power,-power] ) - while robot.gyro_sensor_measure( 'angle' ) < angle: - pass - robot.move_tank( 'off' ) - -forward_and_turnRight(power, 89) -forward_and_turnRight(power, 179) -forward_and_turnRight(power, 269) -forward_and_turnRight(power, 359) -''' - -hint_type = { - 'mW_init': Hint('mW_init'), - 'connectMotorLeft': Hint('connectMotorLeft'), - 'connectMotorRight': Hint('connectMotorRight'), - 'moveSteering': Hint('moveSteering'), - 'onForSeconds': Hint('onForSeconds'), - 'direction': Hint('direction'), - 'seconds': Hint('seconds'), - '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, ['move_steering']): - return [{'id': 'moveSteering'}] - - if not 'on_for_seconds' in code: - return [{'id': 'onForSeconds'}] - - if not 'direction' in code: - return [{'id': 'direction'}] - - if not 'seconds' in code: - return [{'id': 'seconds'}] - - if not 'lr_power' in code: - return [{'id': 'lrPower'}] - - if not has_token_sequence(tokens, ['while']): - return [{'id': 'while'}] - - return None diff --git a/robot/problems/introduction/gyrosquare/sl.py~ b/robot/problems/introduction/gyrosquare/sl.py~ deleted file mode 100644 index 00171e8..0000000 --- a/robot/problems/introduction/gyrosquare/sl.py~ +++ /dev/null @@ -1,40 +0,0 @@ -# coding=utf-8 -import server -mod = server.problems.load_language('python', 'sl') - -id = 210 -name = 'Kvadrat z žiroskopom' -slug = 'Kvadrat z žiroskopom' - -description = '''\ -

Robot naj prevozi kvadrat s stranico 20 cm; pri tem naj si pomaga z žiroskopom.

''' - -hint = { - 'mW_init':['''

Robota v programu predstavimo z mindstorms_widgets(): robot = mindstorms_widgets().

'''], - 'connectMotorLeft':['''

Robotu moramo priključiti levi motor: robot.connect_motor( 'left' ).

'''], - 'connectMotorRight':['''

Robotu moramo priključiti desni motor: robot.connect_motor( 'right' ).

'''], - - 'connectGyro':['''

Robotu priključi žiroskop.

''', - '''

robot.connect_sensor( 'gyro' ).

'''], - 'resetGyro':['''

Žiroskop na začetku resetiraj.

''', - '''

robot.reset_gyro().

'''], - 'setGyroMode':['''

Žiroskopu nastavi način delovanja na merjenje kotov.

''', - '''

robot.gyro_set_mode('angle').

'''], - 'gyroMeasure':['''

Preberi vrednost žiroskopa.

''', - '''

robot.gyro_sensor_measure().

'''], - 'lrPower':['''

Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.

''', - '''

robot.move_tank( 'on', lr_power=[hitrost, -hitrost], ... ).

'''], - 'moveTank':['''

Robot naj se obrne na mestu.

''', - '''

Najprimernejša metoda za to je move_tank

'''], - 'while':['''

Program naj čaka dokler je kot zasuka manjši od 90 stopinj.

''', - '''

robot.gyro_sensor_measure() < 90:

'''], - - 'moveSteering':['''

Sinhroniziraj motorja in ju zaženi.

''', - '''

Za sinhronizirano vožnjo je najbolj primerna metoda robot.move_steering( ... ).

'''], - 'onForSeconds':['''

Prvi argument metode robot.move_steering naj pove, da bo delovanje motorjev časovno omejeno.

''', - '''

robot.move_steering('on_for_seconds', ... ).

'''], - 'direction':['''

Navedi smer premikanja motorjev, naravnost = 0.

''', - '''

robot.move_steering( 'on_for_seconds', direction=0, ... ).

'''], - 'seconds':['''

Napiši časovno omejitev v sekundah.

''', - '''

robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ).

'''], -} -- cgit v1.2.1