From 1e5d42ba53ea0c631dbc6f21887839c91571ebca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20=C5=BDabkar?= Date: Tue, 13 Oct 2015 12:24:41 +0200 Subject: Uvodne vaje za robotiko --- robot/problems/introduction/followline/common.py | 85 ++++++++++++++++++++++ robot/problems/introduction/followline/common.py~ | 85 ++++++++++++++++++++++ robot/problems/introduction/followline/en.py | 14 ++++ .../introduction/followline/naloga12_followLine.py | 31 ++++++++ robot/problems/introduction/followline/sl.py | 34 +++++++++ robot/problems/introduction/followline/sl.py~ | 35 +++++++++ 6 files changed, 284 insertions(+) create mode 100644 robot/problems/introduction/followline/common.py create mode 100644 robot/problems/introduction/followline/common.py~ create mode 100644 robot/problems/introduction/followline/en.py create mode 100644 robot/problems/introduction/followline/naloga12_followLine.py create mode 100644 robot/problems/introduction/followline/sl.py create mode 100644 robot/problems/introduction/followline/sl.py~ (limited to 'robot/problems/introduction/followline') diff --git a/robot/problems/introduction/followline/common.py b/robot/problems/introduction/followline/common.py new file mode 100644 index 0000000..0fc6704 --- /dev/null +++ b/robot/problems/introduction/followline/common.py @@ -0,0 +1,85 @@ +# 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 = 207 +group = 'introduction' +number = 12 +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.connect_sensor( 'color' ) + +start = time.time() +while time.time()-start < 10: + if robot.color_sensor_measure('reflected_light_intensity') < 30: + L, R = 0, 20 + else: + L, R = 20, 0 + robot.move_tank( 'on', lr_power=[L,R]) +robot.move_tank( 'off' ) +''' + +hint_type = { + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveTankOn': Hint('moveTankOn'), + 'lrPower': Hint('lr_power'), + 'moveTankOff': Hint('moveTankOff'), + 'connectColorSensor': Hint('connectColorSensor'), + 'colorSensorMeasureRLI': Hint('colorSensorMeasureRLI'), + 'while': Hint('while'), + 'time': Hint('time'), + 'if': Hint('if') +} + +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_sensor', '(' ]) and 'color' in code): + return [{'id': 'connectColorSensor'}] + + if not (has_token_sequence(tokens, ['move_steering', '(']) and 'on' in code): + return [{'id': 'moveTankOn'}] + + if not 'lr_power' in code: + return [{'id': 'lrPower'}] + + if not (has_token_sequence(tokens, ['move_steering', '(']) and 'off' in code): + return [{'id': 'moveTankOff'}] + + if not (has_token_sequence(tokens, ['color_sensor_measure', '(']) and 'reflected_light_intensity' in code): + return [{'id': 'colorSensorMeasureRLI'}] + + if not has_token_sequence(tokens, ['while']): + return [{'id': 'while'}] + + if not has_token_sequence(tokens, ['time']): + return [{'id': 'time'}] + + if not has_token_sequence(tokens, ['if']): + return [{'id': 'if'}] + + return None diff --git a/robot/problems/introduction/followline/common.py~ b/robot/problems/introduction/followline/common.py~ new file mode 100644 index 0000000..5a3db5b --- /dev/null +++ b/robot/problems/introduction/followline/common.py~ @@ -0,0 +1,85 @@ +# 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 = 207 +group = 'introduction' +number = 12 +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.connect_sensor( 'color' ) + +start = time.time() +while time.time()-start < 10: + if robot.color_sensor_measure('reflected_light_intensity') < 30: + L, R = 0, 20 + else: + L, R = 20, 0 + robot.move_tank( 'on', lr_power=[L,R]) +robot.move_tank( 'off' ) +''' + +hint_type = { + 'mW_init': Hint('mW_init'), + 'connectMotorLeft': Hint('connectMotorLeft'), + 'connectMotorRight': Hint('connectMotorRight'), + 'moveTankOn': Hint('moveTankOn'), + 'lrPower': Hint('lr_power'), + 'moveTankOff': Hint('moveTankOff'), + 'connectColorSensor': Hint('connectColorSensor'), + 'colorSensorMeasureRLI': Hint('colorSensorMeasureRLI'), + 'while': Hint('while'), + 'time': Hint('time'), + 'if': Hint('if') +} + +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_sensor', '(', 'color', ')' ]): + return [{'id': 'connectColorSensor'}] + + if not has_token_sequence(tokens, ['move_tank', '(', 'on', ')']): + return [{'id': 'moveTankOn'}] + + if not has_token_sequence(tokens, ['lr_power']): + return [{'id': 'lrPower'}] + + if not has_token_sequence(tokens, ['move_tank', '(', 'off', ')']): + return [{'id': 'moveTankOff'}] + + if not has_token_sequence(tokens, ['color_sensor_measure', '(', 'reflected_light_intensity', ')']): + return [{'id': 'colorSensorMeasureRLI'}] + + if not has_token_sequence(tokens, ['while']): + return [{'id': 'while'}] + + if not has_token_sequence(tokens, ['time']): + return [{'id': 'time'}] + + if not has_token_sequence(tokens, ['if']): + return [{'id': 'if'}] + + return None diff --git a/robot/problems/introduction/followline/en.py b/robot/problems/introduction/followline/en.py new file mode 100644 index 0000000..3f816fe --- /dev/null +++ b/robot/problems/introduction/followline/en.py @@ -0,0 +1,14 @@ +# coding=utf-8 +import server +mod = server.problems.load_language('python', 'en') + +id = 207 +name = 'Line following' +slug = 'Line following' + +description = '''\ +''' + +hint = { + +} diff --git a/robot/problems/introduction/followline/naloga12_followLine.py b/robot/problems/introduction/followline/naloga12_followLine.py new file mode 100644 index 0000000..347e89e --- /dev/null +++ b/robot/problems/introduction/followline/naloga12_followLine.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# coding=utf-8 + +print( """ +Naloga 12: + Robot naj 10 sekund sledi crni crti na beli podlagi; pri tem naj si pomaga z barvnim senzorjem. +""") +import sys +sys.path.append('/home/user/codeq') +import time +from ev3dev import * +from mindstorms_widgets import mindstorms_widgets + +robot = mindstorms_widgets() +robot.connect_motor( 'left' ) +robot.connect_motor( 'right' ) +robot.connect_sensor( 'color' ) + +start = time.time() +# CALIBRATION +# print 'black', robot.color_sensor_measure('reflected_light_intensity') +# print "move to white" +# time.sleep(5) +# print 'white', robot.color_sensor_measure('reflected_light_intensity') +while time.time()-start < 10: + if robot.color_sensor_measure('reflected_light_intensity') < 30: + L, R = 0, 20 + else: + L, R = 20, 0 + robot.move_tank( 'on', lr_power=[L,R]) +robot.move_tank( 'off' ) diff --git a/robot/problems/introduction/followline/sl.py b/robot/problems/introduction/followline/sl.py new file mode 100644 index 0000000..848fe2b --- /dev/null +++ b/robot/problems/introduction/followline/sl.py @@ -0,0 +1,34 @@ +# coding=utf-8 + +name = 'Sledenje črti' +slug = 'Sledenje črti' + +description = '''\ +

Robot naj 10 sekund sledi črni črti na beli podlagi; pri tem naj si pomaga z barvnim senzorjem.

''' + +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' ).

'''], + + 'moveTankOn':['''

Uporabi metodo za ločen nadzor motorjev, s katero vsakemu od motorjev nastavljaš drugačno moč.

''', + '''

Za to je najbolj primerna metoda robot.move_tank( ... ).

''', + '''

robot.move_tank( 'on', ...)

'''], + 'lrPower': ['''

Nastavi parameter s katerim nastaviš moči levega in desnega motorja.

''', + '''

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

'''], + 'moveTankOff': ['''Ustavi robota.''', + '''

robot.move_tank( 'off' )

'''], + 'connectColorSensor':['''

Robotu moramo priključiti barvni senzor.

''', + '''

robot.connect_sensor( 'color' ).

'''], + 'colorSensorMeasureRLI':['''

Medtem ko se robot pomika naprej, naj uporabi barvni senzor v načinu 'reflected_light_intensity', za zaznavanje jakosti odbite svetlobe.

''', + '''

robot.color_sensor_measure( 'reflected_light_intensity' ).

'''], + 'while':['''

Uporabi zanko, znotraj katere robot sledi črti.

''', + '''

Zanka naj bo časovno omejena, npr. z uporabo metode time.time().

''', + '''

start = time.time()\nwhile time.time()-start < 10:.

'''], + 'time': ['''Uporabi metodo time() za merjenje časa.''', + '''

start = time.time()\nwhile time.time()-start < 10:

'''], + 'if': ['''

V zanki uporabi pogojni stavek...

''', + '''

Če robot vidi črto, naj zavije z nje; če vidi podlago, naj zavije proti črti.

'''] +} diff --git a/robot/problems/introduction/followline/sl.py~ b/robot/problems/introduction/followline/sl.py~ new file mode 100644 index 0000000..5d201fe --- /dev/null +++ b/robot/problems/introduction/followline/sl.py~ @@ -0,0 +1,35 @@ +# coding=utf-8 +import server +mod = server.problems.load_language('python', 'sl') + +id = 207 +name = 'Sledenje črti' +slug = 'Sledenje črti' + +description = '''\ +

Robot naj 10 sekund sledi črni črti na beli podlagi; pri tem naj si pomaga z barvnim senzorjem.

''' + +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' ).

'''], + + 'moveTankOn':['''

Uporabi metodo za ločen nadzor motorjev, s katero vsakemu od motorjev nastavljaš drugačno moč.

''', + '''

Za to je najbolj primerna metoda robot.move_tank( ... ).

''', + '''

robot.move_tank( 'on', ...)

'''], + 'lrPower': ['''

Nastavi parameter s katerim nastaviš moči levega in desnega motorja.

''', + '''

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

'''], + 'moveTankOff': ['''Ustavi robota.''', + '''

robot.move_tank( 'off' )

'''], + 'connectColorSensor':['''

Robotu moramo priključiti barvni senzor.

''', + '''

robot.connect_sensor( 'color' ).

'''], + 'colorSensorMeasureRLI':['''

Medtem ko se robot pomika naprej, naj uporabi barvni senzor v načinu 'reflected_light_intensity', za zaznavanje jakosti odbite svetlobe.

''', + '''

robot.color_sensor_measure( 'reflected_light_intensity' ).

'''], + 'while':['''

Uporabi zanko, znotraj katere robot sledi črti.

''', + '''

Zanka naj bo časovno omejena, npr. z uporabo metode time.time().

''', + '''

start = time.time()\nwhile time.time()-start < 10:.

'''], + 'time': ['''Uporabi metodo time() za merjenje časa.''', + '''

start = time.time()\nwhile time.time()-start < 10:

'''], + 'if': ['''

V zanki uporabi pogojni stavek...

''', + '''

Če robot vidi črto, naj zavije z nje; če vidi podlago, naj zavije proti črti.

'''] +} \ No newline at end of file -- cgit v1.2.1 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/followline/common.py~ | 85 ----------------------- robot/problems/introduction/followline/sl.py~ | 35 ---------- 2 files changed, 120 deletions(-) delete mode 100644 robot/problems/introduction/followline/common.py~ delete mode 100644 robot/problems/introduction/followline/sl.py~ (limited to 'robot/problems/introduction/followline') diff --git a/robot/problems/introduction/followline/common.py~ b/robot/problems/introduction/followline/common.py~ deleted file mode 100644 index 5a3db5b..0000000 --- a/robot/problems/introduction/followline/common.py~ +++ /dev/null @@ -1,85 +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 = 207 -group = 'introduction' -number = 12 -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.connect_sensor( 'color' ) - -start = time.time() -while time.time()-start < 10: - if robot.color_sensor_measure('reflected_light_intensity') < 30: - L, R = 0, 20 - else: - L, R = 20, 0 - robot.move_tank( 'on', lr_power=[L,R]) -robot.move_tank( 'off' ) -''' - -hint_type = { - 'mW_init': Hint('mW_init'), - 'connectMotorLeft': Hint('connectMotorLeft'), - 'connectMotorRight': Hint('connectMotorRight'), - 'moveTankOn': Hint('moveTankOn'), - 'lrPower': Hint('lr_power'), - 'moveTankOff': Hint('moveTankOff'), - 'connectColorSensor': Hint('connectColorSensor'), - 'colorSensorMeasureRLI': Hint('colorSensorMeasureRLI'), - 'while': Hint('while'), - 'time': Hint('time'), - 'if': Hint('if') -} - -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_sensor', '(', 'color', ')' ]): - return [{'id': 'connectColorSensor'}] - - if not has_token_sequence(tokens, ['move_tank', '(', 'on', ')']): - return [{'id': 'moveTankOn'}] - - if not has_token_sequence(tokens, ['lr_power']): - return [{'id': 'lrPower'}] - - if not has_token_sequence(tokens, ['move_tank', '(', 'off', ')']): - return [{'id': 'moveTankOff'}] - - if not has_token_sequence(tokens, ['color_sensor_measure', '(', 'reflected_light_intensity', ')']): - return [{'id': 'colorSensorMeasureRLI'}] - - if not has_token_sequence(tokens, ['while']): - return [{'id': 'while'}] - - if not has_token_sequence(tokens, ['time']): - return [{'id': 'time'}] - - if not has_token_sequence(tokens, ['if']): - return [{'id': 'if'}] - - return None diff --git a/robot/problems/introduction/followline/sl.py~ b/robot/problems/introduction/followline/sl.py~ deleted file mode 100644 index 5d201fe..0000000 --- a/robot/problems/introduction/followline/sl.py~ +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -import server -mod = server.problems.load_language('python', 'sl') - -id = 207 -name = 'Sledenje črti' -slug = 'Sledenje črti' - -description = '''\ -

Robot naj 10 sekund sledi črni črti na beli podlagi; pri tem naj si pomaga z barvnim senzorjem.

''' - -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' ).

'''], - - 'moveTankOn':['''

Uporabi metodo za ločen nadzor motorjev, s katero vsakemu od motorjev nastavljaš drugačno moč.

''', - '''

Za to je najbolj primerna metoda robot.move_tank( ... ).

''', - '''

robot.move_tank( 'on', ...)

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

Nastavi parameter s katerim nastaviš moči levega in desnega motorja.

''', - '''

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

'''], - 'moveTankOff': ['''Ustavi robota.''', - '''

robot.move_tank( 'off' )

'''], - 'connectColorSensor':['''

Robotu moramo priključiti barvni senzor.

''', - '''

robot.connect_sensor( 'color' ).

'''], - 'colorSensorMeasureRLI':['''

Medtem ko se robot pomika naprej, naj uporabi barvni senzor v načinu 'reflected_light_intensity', za zaznavanje jakosti odbite svetlobe.

''', - '''

robot.color_sensor_measure( 'reflected_light_intensity' ).

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

Uporabi zanko, znotraj katere robot sledi črti.

''', - '''

Zanka naj bo časovno omejena, npr. z uporabo metode time.time().

''', - '''

start = time.time()\nwhile time.time()-start < 10:.

'''], - 'time': ['''Uporabi metodo time() za merjenje časa.''', - '''

start = time.time()\nwhile time.time()-start < 10:

'''], - 'if': ['''

V zanki uporabi pogojni stavek...

''', - '''

Če robot vidi črto, naj zavije z nje; če vidi podlago, naj zavije proti črti.

'''] -} \ No newline at end of file -- cgit v1.2.1 From 3bcdcda1631abe6fed0eb0fa0ea608a7170274bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20=C5=BDabkar?= Date: Wed, 14 Oct 2015 15:38:37 +0200 Subject: fixed: TabError: inconsistent use of tabs and spaces in indentation --- robot/problems/introduction/followline/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'robot/problems/introduction/followline') diff --git a/robot/problems/introduction/followline/common.py b/robot/problems/introduction/followline/common.py index 0fc6704..d61d4c1 100644 --- a/robot/problems/introduction/followline/common.py +++ b/robot/problems/introduction/followline/common.py @@ -69,8 +69,8 @@ def hint( code): if not (has_token_sequence(tokens, ['move_steering', '(']) and 'off' in code): return [{'id': 'moveTankOff'}] - - if not (has_token_sequence(tokens, ['color_sensor_measure', '(']) and 'reflected_light_intensity' in code): + + if not (has_token_sequence(tokens, ['color_sensor_measure', '(']) and 'reflected_light_intensity' in code): return [{'id': 'colorSensorMeasureRLI'}] if not has_token_sequence(tokens, ['while']): -- cgit v1.2.1