fix removing extra zeros and value types

default compiler and includes have been fixed too

Author: erincones

Makefile

@@ -14,10 +14,11 @@ CP := cp -ruv
 
 
 # Compiler
-CXX = g++
+#CXX = g++
 CXXFLAGS = -Wall -Wextra -Wpedantic
-LIBS =
-LDFLAGS =
+#LIBS =
+#LDFLAGS =
+
 
 # Main target
 TARGET := $(BIN)/$(PROJECT)

README.md

@@ -12,10 +12,14 @@ overloaded. Also, the `std::string` conversion operator is overloaded.
 
 ## Build
 
-Use the [`Makefile`] file to build the binary at `bin/bigfib`.
+Use the [`Makefile`] file to build the binary. There are some targets available:
 
-`g++` is configured as the compiler by default, you can change it modifying the
-[`CXX`] variable if you want.
+ - `release`: The default target generates de optimized binary at `bin/bigfib`.
+ - `debug`: Generates the binary for debugging with `gdb`.
+ - `clean`: Removes all the compilation files.
+
+Feel free to update the [`CXX`], [`CXXFLAGS`], [`LIBS`] and [`LDFLAGS`]
+variables if you need.
 
 
 ## CLI usage
@@ -45,4 +49,7 @@ Share and enjoy!
 [`bigint`]: src/bigint.hpp
 [`Makefile`]: Makefile
 [`CXX`]: Makefile#L17
+[`CXXFLAGS`]: Makefile#L18
+[`LIBS`]: Makefile#L19
+[`LDFLAGS`]: Makefile#L20
 [LICENSE]: LICENSE

src/bigint.cpp

@@ -9,7 +9,7 @@
 // Naive multiplication
 std::vector<ull> bigint::_NAIVE_MULT(const std::vector<ull> &a, const std::vector<ull> &b) {
   std::size_t len = a.size();
-  std::vector<ull> r(len << 1);
+  std::vector<ull> r(len << 1ULL);
 
   std::vector<ull>::const_iterator aend = a.cend();
   std::vector<ull>::const_iterator bend = b.cend();
@@ -39,7 +39,7 @@ std::vector<ull> bigint::_NAIVE_MULT(const std::vector<ull> &a, const std::vecto
 std::vector<ull> bigint::_KARATSUBA_MULT(const std::vector<ull> &a, const std::vector<ull> &b) {
   const std::size_t len = a.size();
 
-  if (len <= 32) {
+  if (len <= static_cast<std::size_t>(32)) {
     return bigint::_NAIVE_MULT(a, b);
   }
 
@@ -64,7 +64,7 @@ std::vector<ull> bigint::_KARATSUBA_MULT(const std::vector<ull> &a, const std::v
   const std::vector<ull>::const_iterator bli = bl.cbegin();
   const std::vector<ull>::const_iterator bri = br.cbegin();
 
-  for (std::size_t i = 0; i < mid; ++i) {
+  for (std::size_t i = static_cast<std::size_t>(0); i < mid; ++i) {
     *(alri + i) = *(ali + i) + *(ari + i);
     *(blri + i) = *(bli + i) + *(bri + i);
   }
@@ -77,7 +77,7 @@ std::vector<ull> bigint::_KARATSUBA_MULT(const std::vector<ull> &a, const std::v
   const std::vector<ull>::iterator p3i = p3.begin();
   const std::vector<ull>::iterator ri = r.begin();
 
-  for (std::size_t i = 0; i < len; ++i) {
+  for (std::size_t i = static_cast<std::size_t>(0); i < len; ++i) {
     const ull p2ii = *(p2i + i);
     *(p3i + i) -= p2ii + *(p1i + i);
     *(ri + i) = p2ii;
@@ -225,7 +225,7 @@ const bigint operator - (const bigint &a, const bigint &b) {
   for (std::vector<ull>::const_reverse_iterator i = r.crbegin(); *i == 0ULL; ++i, ++c);
 
   if (c != 0ULL) {
-    r.resize(std::max(r.size() - static_cast<std::size_t>(c), static_cast<std::size_t>(1)));
+    r.resize(r.size() > static_cast<std::size_t>(c) ? r.size() - static_cast<std::size_t>(c) : static_cast<std::size_t>(1));
   }
 
   return r;
@@ -264,7 +264,7 @@ const bigint operator * (const bigint &a, const bigint &b) {
   for (std::vector<ull>::const_reverse_iterator i = r.crbegin(); *i == 0ULL; ++i, ++extra);
 
   if (extra != static_cast<std::size_t>(0)) {
-    r.resize(std::max(r.size() - extra, static_cast<std::size_t>(1)));
+    r.resize(r.size() > extra ? r.size() - extra : static_cast<std::size_t>(1));
   }
 
   return r;

src/bigint.hpp

@@ -53,7 +53,7 @@ class bigint {
     /**
      * Default constructor
      */
-    inline bigint() : _data(1, 0) {};
+    inline bigint() : _data(static_cast<std::size_t>(1), 0ULL) {};
 
     /**
      * Big integer copy constructor
@@ -67,7 +67,7 @@ class bigint {
      *
      * @param n Initializator
      */
-    inline bigint(const ull &n) : _data(1, n) {};
+    inline bigint(const ull &n) : _data(static_cast<std::size_t>(1), n) {};
 
 
     /**

src/fib.cpp

@@ -5,6 +5,7 @@
 #include <sstream>
 #include <chrono>
 
+
 /** Get current clock time */
 #define NOW std::chrono::high_resolution_clock::now
 
@@ -23,20 +24,20 @@ typedef std::chrono::high_resolution_clock::time_point time_point;
 
 // Calculate Fibonacci number
 bigint Fibonacci::calc() {
-  if (n == 0) {
-    return 0;
+  if (n == 0ULL) {
+    return 0ULL;
   }
-  else if (n < 3) {
-    return 1;
+  else if (n < 3ULL) {
+    return 1ULL;
   }
 
-  ull h = 0;
-  bigint a = 0;
-  bigint b = 1;
+  ull h = 0ULL;
+  bigint a = 0ULL;
+  bigint b = 1ULL;
 
   for (ull i = n; i; ++h, i >>= 1ULL);
 
-  for (ull m = 1 << (h - 1); m; m >>= 1) {
+  for (ull m = 1ULL << (h - 1ULL); m; m >>= 1ULL) {
     bigint c = a * (b + b - a);
     bigint d = a * a + b * b;
 
@@ -109,4 +110,4 @@ void Fibonacci::print(const bool &summary, const bool &number) const {
       << "Total time:       " << FORMAT << this->_calc_ms + this->_cast_ms + cout_ms << " ms"
       << std::endl;
   }
-};
+}

src/ui.cpp

@@ -3,10 +3,11 @@
 
 #include <iostream>
 #include <cstring>
+#include <stdexcept>
 
 
 /** Version */
-#define VERSION "2.0"
+#define VERSION "2.1"
 
 
 // Private methods