From a86a6ca92d315dedf3ce4d5035a4c38178f8b531 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Tue, 13 Oct 2015 13:00:05 +0200
Subject: Remove backup files and add *~ to .gitignore

---
 robot/problems/introduction/printcolors/common.py~ | 80 ----------------------
 robot/problems/introduction/printcolors/sl.py~     | 37 ----------
 2 files changed, 117 deletions(-)
 delete mode 100644 robot/problems/introduction/printcolors/common.py~
 delete mode 100644 robot/problems/introduction/printcolors/sl.py~

(limited to 'robot/problems/introduction/printcolors')

diff --git a/robot/problems/introduction/printcolors/common.py~ b/robot/problems/introduction/printcolors/common.py~
deleted file mode 100644
index 04ca0d6..0000000
--- a/robot/problems/introduction/printcolors/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 = 211
-group = 'introduction'
-number = 9
-visible = True
-
-solution = '''\
-import time
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
-
-color_table = ['none', 'black', 'blue', 'green', 'yellow', 'red', 'white', 'brown']
-
-robot = mindstorms_widgets()
-robot.connect_motor( 'left' )
-robot.connect_motor( 'right' )
-robot.connect_sensor( 'color' )
-
-robot.move_steering( 'on')
-start = time.time()
-color = -1
-while time.time()-start < 2.1:
-    c = robot.color_sensor_measure('color')
-    if c!=color:
-        print( c, color_table[c])
-        color = c
-robot.move_steering( 'off' )
-'''
-
-hint_type = {
-    'mW_init': Hint('mW_init'),
-    'connectMotorLeft': Hint('connectMotorLeft'),
-    'connectMotorRight': Hint('connectMotorRight'),
-    'moveSteeringOn': Hint('moveSteeringOn'),
-    'moveSteeringOff': Hint('moveSteeringOff'),
-    'connectColorSensor': Hint('connectColorSensor'),
-    'colorSensorMeasure': Hint('colorSensorMeasure'),
-    'while': Hint('while'),
-    'print': Hint('print')
-}
-
-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_steering', '(', 'on', ')']):
-        return [{'id': 'moveSteeringOn'}]
-
-    if not has_token_sequence(tokens, ['move_steering', '(', 'off', ')']):
-        return [{'id': 'moveSteeringOff'}]
-
-    if not has_token_sequence(tokens, ['color_sensor_measure', '(', 'color', ')']):
-        return [{'id': 'colorSensorMeasure'}]
-    
-    if not has_token_sequence(tokens, ['while']):
-        return [{'id': 'while'}]
-    
-    if not has_token_sequence(tokens, ['print', '(']):
-        return [{'id': 'print'}]
-    
-    return None
\ No newline at end of file
diff --git a/robot/problems/introduction/printcolors/sl.py~ b/robot/problems/introduction/printcolors/sl.py~
deleted file mode 100644
index 9d5ec21..0000000
--- a/robot/problems/introduction/printcolors/sl.py~
+++ /dev/null
@@ -1,37 +0,0 @@
-# coding=utf-8
-import server
-mod = server.problems.load_language('python', 'sl')
-
-id = 211
-name = 'Zaznavanje barv'
-slug = 'Zaznavanje barv'
-
-description = '''\
-<p>Robot naj se pelje čez barvne črte in na zaslon izpiše barvo, ki jo zazna s svetlobnim senzorjem.
-     Value	Color
-       0	none
-       1	black
-       2	blue
-       3	green
-       4	yellow
-       5	red
-       6	white
-       7	brown</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>'''],
-    'moveSteeringOn':['''<p>Sinhroniziraj motorja in ju zaženi.</p>''',
-                    '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( 'on' )</code>.</p>'''],
-    'moveSteeringOff':['''<p>Ustavi motorja.</p>''',
-                    '''<p><code>robot.move_steering( 'off' )</code>.</p>'''],
-    'connectColorSensor':['''<p>Robotu moramo priključiti barvni senzor.</p>''',
-                    '''<p><code>robot.connect_sensor( 'color' )</code>.</p>'''],
-    'colorSensorMeasure':['''<p>Medtem ko se robot pomika naprej, naj uporabi barvni senzor v načinu 'color', s katerim pove, katero barvo trenutno vidi.</p>''',
-                    '''<p><code>robot.color_sensor_measure( 'color' )</code>.</p>'''],
-    'while':['''<p>Uporabi zanko, znotraj katere robot odčitava barve in povečuje števec.</p>''',
-             '''<p>Zanka je lahko časovno omejena, npr. z uporabo metode <code>time.time()</code>.</p>''',
-             '''<p><code>while time.time()-start < 1.1:</code>.</p>'''],
-    'print':['''<p>V zanki na zaslon izpisuj barvo, ki jo zazna robot.</p>''']
-}
\ No newline at end of file
-- 
cgit v1.2.1