Changeset 11644 for code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

Timestamp:

Dec 8, 2017, 2:55:15 PM (6 years ago)

Author:

kuchlert

Message:

eigentlich fertig nur noch altes system entfernen

File:

• code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified) (4 diffs)

code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

@@ -35 +35 @@
     }
 
-        void Dialog::setName(std::string name)
+        void Dialog::setName(const std::string& name)
         {
                 this->name_ = name;
         }
 
-        std::string Dialog::getName() 
+        const std::string& Dialog::getName() const 
         {
                 return this->name_;
         }
 
-        void Dialog::setCurrentQuestionId(std::string questionId)
+        void Dialog::setCurrentQuestionId(const std::string& questionId)
         {
                 this->currentQuestionId_ = questionId;
         }
 
-        std::string Dialog::getCurrentQuestionId()
+        const std::string& Dialog::getCurrentQuestionId() const
         {
                 return this->currentQuestionId_;
@@ -61 +61 @@
         }
 
+        const Question* Dialog::getQuestion() const // returned nichts
+        {
+                return nullptr;
+        }
+
         void Dialog::addAnswer(Answer* answer) //fuegt Answer der Map hinzu
         {
@@ -66 +71 @@
         }
 
-        Question* Dialog::getQuestion(unsigned int index) const // returned nichts
+        const Answer* Dialog::getAnswer(unsigned int index) const       //returned sting der Antwort zur Id.
         {
                 return nullptr;
-                // Question question = (questions_.find(this->currentQuestionId_))->second;
-                // return question.getQuestion();
         }
 
-        Answer* Dialog::getAnswer(unsigned int index) const     //returned sting der Antwort zur Id.
-        {
-                return nullptr;
-                // return (this->answers_.find(answerId))->second.getAnswer();
-        }
 
-        std::vector<std::string>* Dialog::getAnswerIds() // returned vector mit allen momentanen AntwortenIds
+        const std::vector<std::string>* Dialog::getAnswerIds() // returned vector mit allen momentanen AntwortenIds
         {
                 
                 Question* question = (this->questions_.find(this->currentQuestionId_))->second;
-                std::vector<std::string>* answers = question->getAnswerIds();
+                const std::vector<std::string>* answers = question->getAnswerIds();
                 return answers;
                 
@@ -103 +101 @@
     }
 
-    void Dialog::update(std::string givenAnswer)
+    void Dialog::update(const std::string& givenAnswerId)
     {
-        Answer* answer = (answers_.find(givenAnswer))->second;
+        Answer* answer = (answers_.find(givenAnswerId))->second;
         this->currentQuestionId_ = answer->getNextQuestion();
     }
 
-    bool Dialog::ending() //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
+    bool Dialog::ending(const std::string& givenAnswerId)
     {
-        bool end = false;
-        if ((this->questions_.find(this->currentQuestionId_)->second)->getAnswerIds()->empty()){
-                end = true;
-        }       
-        return end;
+        return !this->questions_.count(this->answers_.find(givenAnswerId)->second->getNextQuestion());
     }
 
-        std::string Dialog::getQuestionString()
+        const std::string& Dialog::getQuestionString()
         {
                 return this->questions_.find(this->currentQuestionId_)->second->getQuestion();
         }
 
-        std::string Dialog::getAnswerString(std::string answerId)
+        const std::string& Dialog::getAnswerString(std::string answerId)
         {
                 return this->answers_.find(answerId)->second->getAnswer();