fixing asserts

adding mean_mark.hpp implementation
don't use STL in array (required)

1 files changed, 13 insertions, 10 deletions

diff --git a/ue5/verwendung.cpp b/ue5/verwendung.cpp
index 9e10326..8a20e6c 100644
--- a/ue5/verwendung.cpp
+++ b/ue5/verwendung.cpp
@@ -2,6 +2,7 @@
 #include <cassert> // for assert
 #include <utility> // for std::move
 #include <stdexcept> // for std::out_of_range
+#include <iostream> //TODO
 
 struct Person
 {
@@ -153,22 +154,24 @@ int main()
     a1.swap(a2);
     assert(a1[0] == 4);
     assert(a2[2] == 3);
+
+    for(array<int,3>::iterator it = a2.begin(); it != a2.end(); ++it)
+      std::cout << (*it) << std::endl;
 #endif
 
 #ifdef SOLVED_3
     double mean = mean_mark(a.begin(), a.end());
-    assert (mean >= 3.1 || mean <= 3.3);
+    assert (mean >= 3.1 && mean <= 3.3);
 
     double mean_student = mean_mark_student(a.begin(), a.end());
-    assert (mean_student >= 3.1 || mean_student <= 3.3);
+    assert (mean_student >= 3.1 && mean_student <= 3.3);
 
     sarray::iterator end = remove_greater(a.begin(), a.end(), 3);
     double mean2 = mean_mark(a.begin(), end);
-    assert (mean2 >= 1.4 || mean2 <= 1.6);
+    assert (mean2 >= 1.4 && mean2 <= 1.6);
 #endif
   }
 
-
   {
     typedef array<shared_ptr<Person>, 5> parray;
     parray m;
@@ -180,14 +183,14 @@ int main()
 
 #ifdef SOLVED_3
     double mean = mean_mark(m.begin(), m.end());
-    assert (mean >= 2.3 || mean <= 2.5);
+    assert (mean >= 2.3 && mean <= 2.5);
 
     double mean_student = mean_mark_student(m.begin(), m.end());
-    assert (mean_student >= 3.6 || mean_student <= 3.8);
+    assert (mean_student >= 3.6 && mean_student <= 3.8);
 
     parray::iterator end = remove_greater(m.begin(), m.end(), 3);
     double mean2 = mean_mark(m.begin(), end);
-    assert (mean2 >= 0.9 || mean2 <= 1.1);
+    assert (mean2 >= 0.9 && mean2 <= 1.1);
 #endif
   }
 
@@ -201,17 +204,17 @@ int main()
 
 #ifdef SOLVED_3
     double mean = mean_mark(m.begin(), m.end());
-    assert (mean >= 2.3 || mean <= 2.5);
+    assert (mean >= 2.3 && mean <= 2.5);
 
     double mean_student = mean_mark_student(m.begin(), m.end());
-    assert (mean_student >= 3.6 || mean_student <= 3.8);
+    assert (mean_student >= 3.6 && mean_student <= 3.8);
 
     assert(m.size() == 5);
     m.erase(remove_greater(m.begin(), m.end(), 3), m.end());
     assert(m.size() == 3);
 
     double mean2 = mean_mark(m.begin(), m.end());
-    assert (mean2 >= 0.9 || mean2 <= 1.1);
+    assert (mean2 >= 0.9 && mean2 <= 1.1);
 #endif
   }