Library 2

Fixed issue #3 and fixed another bug.

librerie/exercise2/build.sh

@@ -5,4 +5,4 @@ g++ -g -O3 -o main \
   zlasdtest/exercise1/simpletest.cpp zlasdtest/exercise1/fulltest.cpp \
   zlasdtest/exercise2/simpletest.cpp zlasdtest/exercise2/fulltest.cpp \
   zlasdtest/container/container.cpp \
-  zlasdtest/test.cpp main.cpp
+  zlasdtest/test.cpp zmytest/test.cpp main.cpp

librerie/exercise2/queue/vec/queuevec.cpp

@@ -180,7 +180,7 @@ void QueueVec<Data>::Reduce(){
   ulong newsize = (ulong)size/2;
   Data* tmp = new Data[newsize];
   ulong current_index = front , i=0;
-  while(i < newsize){
+  while(current_index != rear){
     tmp[i] = Elements[current_index];
     current_index = (current_index+1)%size;
     ++i;
@@ -189,7 +189,7 @@ void QueueVec<Data>::Reduce(){
   Elements = tmp;
   front = 0;
   rear = i;
-  size *= 2;
+  size = newsize;
 }
 
 }

librerie/exercise2/zmytest/test.cpp

@@ -213,7 +213,7 @@ void QueueFunctions(T& queue){
     std::cout<<"4. Lettura non distruttiva (Head)"<<std::endl;
     std::cout<<"5. Test di vuotezza"<<std::endl;
     std::cout<<"6. Dimensione"<<std::endl;
-    std::cout<<"7. Clear Stack"<<std::endl;
+    std::cout<<"7. Clear Queue"<<std::endl;
     std::cout<<"8. Vai indietro"<<std::endl;
     std::cout<<"9. Esci"<<std::endl;
     std::cin>>std::ws;

librerie/exercise2/zmytest/test.hpp

@@ -68,5 +68,4 @@ std::string generateRandomString(ulong);
 ulong getDimension();
 
 /* ************************************************************************** */
-#include"test.cpp"
 #endif