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/gyro90/common.py~ | 80 ---------------------- .../introduction/gyro90/naloga07_gyro90.py~ | 34 --------- robot/problems/introduction/gyro90/sl.py~ | 32 --------- 3 files changed, 146 deletions(-) delete mode 100644 robot/problems/introduction/gyro90/common.py~ delete mode 100644 robot/problems/introduction/gyro90/naloga07_gyro90.py~ delete mode 100644 robot/problems/introduction/gyro90/sl.py~ (limited to 'robot/problems/introduction/gyro90') 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 = '''\ -

Robot naj se na mestu obrne za 90 stopinj v desno; pri tem naj si pomaga z žiroskopom.

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

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

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

Robotu priključi levi motor.

''', - '''

robot.connect_motor( 'left' ).

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

Robotu priključi 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 teče dokler je kot zasuka manjši od 90 stopinj.

''', - '''

robot.gyro_sensor_measure() < 90:

'''], -} \ No newline at end of file -- cgit v1.2.1