From 4d9844391e95a22400c18f3508f6fe6eca472f95 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sun, 24 Feb 2013 10:01:32 +0100
Subject: [PATCH] rename 'ResultElement' to 'FeedbackItem'

---
 knowledge/survey/README.txt       | 14 +++++++-------
 knowledge/survey/interfaces.py    |  8 ++++----
 knowledge/survey/questionnaire.py | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/knowledge/survey/README.txt b/knowledge/survey/README.txt
index 25a6c47..317411f 100644
--- a/knowledge/survey/README.txt
+++ b/knowledge/survey/README.txt
@@ -13,14 +13,14 @@ Let's first set up a  questionaire.
 
 We now assign result elements with the questions of this questionnaire.
 
-  >>> from cybertools.knowledge.survey.questionnaire import ResultElement
-  >>> re01 = ResultElement('re01')
-  >>> re02 = ResultElement('re02')
-  >>> re03 = ResultElement('re03')
+  >>> from cybertools.knowledge.survey.questionnaire import FeedbackItem
+  >>> re01 = FeedbackItem('re01')
+  >>> re02 = FeedbackItem('re02')
+  >>> re03 = FeedbackItem('re03')
 
-  >>> qu01.resultElements = {re01: 0.8, re03: 0.2}
-  >>> qu02.resultElements = {re01: 0.3, re02: 0.7, re03: 0.1}
-  >>> qu03.resultElements = {re01: 0.2, re03: 0.9}
+  >>> qu01.feedbackItems = {re01: 0.8, re03: 0.2}
+  >>> qu02.feedbackItems = {re01: 0.3, re02: 0.7, re03: 0.1}
+  >>> qu03.feedbackItems = {re01: 0.2, re03: 0.9}
 
 
 Responses
diff --git a/knowledge/survey/interfaces.py b/knowledge/survey/interfaces.py
index d8a721d..ed7da20 100644
--- a/knowledge/survey/interfaces.py
+++ b/knowledge/survey/interfaces.py
@@ -45,16 +45,16 @@ class IQuestion(Interface):
     text = Attribute('The question asked.')
     questionnaire = Attribute('The questionnaire this question belongs to.')
     answerOptions = Attribute('A sequence of answer options to select from.')
-    resultElements = Attribute('A mapping with result elements as keys and '
+    feedbackItems = Attribute('A mapping with feedback items as keys and '
             'corresponding relevance factors as values.')
 
 
-class IResultElement(Interface):
+class IFeedbackItem(Interface):
     """ Some text (e.g. a recommendation) or some other kind of information
-        that may be deduced from the res)ponses to a questionnaire.
+        that may be deduced from the responses to a questionnaire.
     """
 
-    text = Attribute('A text representing this result element.')
+    text = Attribute('A text representing this feedback item.')
 
 
 class IResponse(Interface):
diff --git a/knowledge/survey/questionnaire.py b/knowledge/survey/questionnaire.py
index d626b76..b30c780 100644
--- a/knowledge/survey/questionnaire.py
+++ b/knowledge/survey/questionnaire.py
@@ -22,7 +22,7 @@ Questionnaires, questions and other stuff needed for surveys.
 
 from zope.interface import implements
 from cybertools.knowledge.survey.interfaces import IQuestionnaire, IQuestion
-from cybertools.knowledge.survey.interfaces import IResultElement, IResponse
+from cybertools.knowledge.survey.interfaces import IFeedbackItem, IResponse
 
 
 class Questionnaire(object):
@@ -43,7 +43,7 @@ class Question(object):
     
     def __init__(self, questionnaire, text=u''):
         self.questionnaire = questionnaire
-        self.resultElements = {}
+        self.feedbackItems = {}
         self.text = text
 
     def getAnswerOptions(self):
@@ -53,9 +53,9 @@ class Question(object):
     answerOptions = property(getAnswerOptions, setAnswerOptions)
 
 
-class ResultElement(object):
+class FeedbackItem(object):
 
-    implements(IResultElement)
+    implements(IFeedbackItem)
     
     def __init__(self, text=u''):
         self.text = text
@@ -73,7 +73,7 @@ class Response(object):
     def getResult(self):
         result = {}
         for question, value in self.values.items():
-            for re, rf in question.resultElements.items():
-                result[re] = result.get(re, 0.0) + rf * value
+            for fi, rf in question.feedbackItems.items():
+                result[fi] = result.get(fi, 0.0) + rf * value
                 #print re.text, rf, value
         return sorted(result.items(), key=lambda x: -x[1])