Changes in src/periodentafel.cpp [f66195:fb73b8]

File:

• src/periodentafel.cpp (modified) (9 diffs)

src/periodentafel.cpp

@@ -21 +21 @@
  * Initialises start and end of list and resets periodentafel::checkliste to false.
  */
-periodentafel::periodentafel()
-{
-  start = new element;
-  end = new element;
+periodentafel::periodentafel() : start(new element), end(new element)
+{
   start->previous = NULL;
   start->next = end;
@@ -45 +43 @@
  * \return true - succeeded, false - does not occur
  */
-bool periodentafel::AddElement(element *pointer)
+bool periodentafel::AddElement(element * const pointer)
 {
   pointer->sort = &pointer->Z;
@@ -57 +55 @@
  * \return true - succeeded, false - element not found
  */
-bool periodentafel::RemoveElement(element *pointer)
+bool periodentafel::RemoveElement(element * const pointer)
 {
   return remove(pointer, start, end);
@@ -71 +69 @@
 
 /** Finds an element by its atomic number.
- * If element is not yet in list, datas are asked and stored in database.
+ * If element is not yet in list, returns NULL.
  * \param Z atomic number
- * \return pointer to element
- */
-element * periodentafel::FindElement(int Z)
+ * \return pointer to element or NULL if not found
+ */
+element * const periodentafel::FindElement(const int Z) const
 {
   element *walker = find(&Z, start,end);
-  if (walker == NULL) { // not found: enter and put into db
-    cout << Verbose(0) << "Element not found in database, please enter." << endl;
-    walker = new element;
-    cout << Verbose(0) << "Mass: " << endl;
-    cin >> walker->mass;
-    walker->Z = Z;
-    cout << Verbose(0) << "Atomic number: " << walker->Z << endl;
-    cout << Verbose(0) << "Name [max 64 chars]: " << endl;
-    cin >> walker->name;
-    cout << Verbose(0) << "Short form [max 3 chars]: " << endl;
-    cin >> walker->symbol;
-    periodentafel::AddElement(walker);
-  }
   return(walker);
 };
@@ -99 +84 @@
  * \return pointer to element
  */
-element * periodentafel::FindElement(const char *shorthand) const
+element * const periodentafel::FindElement(const char * const shorthand) const
 {
   element *walker =  periodentafel::start;
@@ -112 +97 @@
 /** Asks for element number and returns pointer to element
  */
-element * periodentafel::AskElement()
+element * const periodentafel::AskElement() const
 {
   element *walker = NULL;
@@ -124 +109 @@
 };
 
+/** Asks for element and if not found, presents mask to enter info.
+ * \return pointer to either present or newly created element
+ */
+element * const periodentafel::EnterElement()
+{
+  element *walker = NULL;
+  int Z = -1;
+  cout << Verbose(0) << "Atomic number: " << Z << endl;
+  cin >> Z;
+  walker = FindElement(Z);
+  if (walker == NULL) {
+    cout << Verbose(0) << "Element not found in database, please enter." << endl;
+    walker = new element;
+    walker->Z = Z;
+    cout << Verbose(0) << "Mass: " << endl;
+    cin >> walker->mass;
+    cout << Verbose(0) << "Name [max 64 chars]: " << endl;
+    cin >> walker->name;
+    cout << Verbose(0) << "Short form [max 3 chars]: " << endl;
+    cin >> walker->symbol;
+    periodentafel::AddElement(walker);
+  }
+  return(walker);
+};
+
 /** Prints period table to given stream.
  * \param output stream
  */
-bool periodentafel::Output(ofstream *output) const
+bool periodentafel::Output(ofstream * const output) const
 {
   bool result = true;
@@ -145 +155 @@
  * \param *checkliste elements table for this molecule
  */
-bool periodentafel::Checkout(ofstream *output, const int *checkliste) const
+bool periodentafel::Checkout(ofstream * const output, const int * const checkliste) const
 {
   element *walker = start;
@@ -215 +225 @@
         cout << "Could not parse element: ";
         neues->Output((ofstream *)&cout);
+        delete(neues);
       }
     }