Artemis: Proposed changes for increased performance

src/algorithms/primes.cc

@@ -5,12 +5,24 @@
  *  @param n Number to check
  *  @return True if n is prime, false otherwise
  */
-bool
-Primes::IsPrime(int n) {
+
+ bool Primes::IsPrime(int n) {
   if (n <= 1) {
     return false;
   }
-  for (int i = 2; i < n; i += 1) {
+  for (int i = 2; i < n; i++) {
+    if (n % i == 0) {
+      return false;
+    }
+  }
+  return true;
+}
+    if (n % i == 0) {
+      return false;
+    }
+  }
+  return true;
+}
     if (n % i == 0) {
       return false;
     }
@@ -51,4 +63,4 @@ Primes::PrimeFactors(int n) {
     }
   }
   return factors;
-}
+}

src/algorithms/sort.cc

@@ -57,4 +57,4 @@ Sort::MaxN(std::vector<int> &v, int n) {
   }
 
   return ret;
-}
+}

src/control/double.cc

@@ -29,9 +29,7 @@ long
 DoubleForLoop::SumTriangle(int n) {
   long sum = 0;
   for (int i = 0; i < n + 1; i += 1) {
-    for (int j = 0; j < i; j += 1) {
-      sum = sum + (long) j;
-    }
+    sum += (i - 1) * i / 2;
   }
   return sum;
 }
@@ -72,11 +70,10 @@ DoubleForLoop::CountPairs(std::vector<int> v) {
 int
 DoubleForLoop::CountDuplicates(std::vector<int> v0, std::vector<int> v1) {
   int count = 0;
-  for (int i = 0; i < (int) v0.size(); i += 1) {
-    for (int j = 0; j < (int) v1.size(); j += 1) {
-      if (i == j && v0[i] == v1[j]) {
-        count += 1;
-      }
+  int minSize = std::min(v0.size(), v1.size());
+  for (int i = 0; i < minSize; i += 1) {
+    if (v0[i] == v1[i]) {
+      count += 1;
     }
   }
   return count;
@@ -98,4 +95,4 @@ DoubleForLoop::SumMatrix(std::vector<std::vector<int>> matrix) {
     }
   }
   return sum;
-}
+}

src/control/single.cc

@@ -50,15 +50,11 @@ SingleForLoop::MaxVector(std::vector<int> &arr) {
  */
 int
 SingleForLoop::SumModulus(int n, int m) {
-  int array[n];
   int sum = 0;
   for (int i = 0; i < n; i += 1) {
-    array[i] = i;
-  }
-  for (int i = 0; i < n; i += 1) {
-    if (array[i] % m == 0) {
-      sum += array[i];
+    if (i % m == 0) {
+      sum += i;
     }
   }
   return sum;
-}
+}

src/datastructures/linkedlist.cc

@@ -79,21 +79,19 @@ LinkedList::AddNode(int n) {
  */
 bool
 LinkedList::SearchList(int n) {
-  Node *current = head;
-  while (current != nullptr) {
+  for (Node *current = head; current != nullptr; current = current->next) {
     if (current->data == n) {
       return true;
     }
-    current = current->next;
   }
   return false;
 }
 
 /** @brief Reverses the linked list
  *
  */
-void
-LinkedList::ReverseList() {
+
+ void LinkedList::ReverseList() {
   Node *current = head;
   Node *prev = nullptr;
   Node *next = nullptr;
@@ -120,4 +118,4 @@ LinkedList::At(int n) {
     current = current->next;
   }
   return current->data;
-}
+}

src/datastructures/vector.cc

@@ -59,8 +59,8 @@ std::vector<int>
 OpsVector::SortVector(std::vector<int> &v) {
   std::vector<int> ret(v);
 
-  for (int i = 0; i < (int) ret.size(); i += 1) {
-    for (int j = 0; j < (int) ret.size() - 1; j += 1) {
+  for (int i = 0; i < (int) ret.size() - 1; i += 1) {
+    for (int j = 0; j < (int) ret.size() - i - 1; j += 1) {
       if (ret[j] > ret[j + 1]) {
         int temp = ret[j];
         ret[j] = ret[j + 1];
@@ -126,4 +126,4 @@ OpsVector::MergeVectors(std::vector<int> &v1, std::vector<int> &v2) {
   }
 
   return ret;
-}
+}

src/generator/genvector.cc

@@ -10,13 +10,10 @@
  */
 std::vector<int>
 GenVector::RandomVector(int n, int m) {
-  std::vector<int> ret = std::vector<int>(n);
-
-  srand(0);
+  std::vector<int> ret(n);
   for (int i = 0; i < n; i += 1) {
     ret[i] = rand() % m;
   }
-
   return ret;
 }
 
@@ -60,4 +57,4 @@ GenVector::RandomSquareMatrix(int n, int m) {
   }
 
   return ret;
-}
+}