aboutsummaryrefslogtreecommitdiffstats
path: root/ee2301
diff options
context:
space:
mode:
authorRossTheRoss <mstrapp@protonmail.com>2020-01-30 16:55:04 -0600
committerRossTheRoss <mstrapp@protonmail.com>2020-01-30 16:55:04 -0600
commit175721a63b426355274fa9e8063f762020ab8362 (patch)
treecf2c1b33233d660c9f50de5e659b9343bb264984 /ee2301
parentMake Python thing in Python (diff)
downloadhomework-175721a63b426355274fa9e8063f762020ab8362.tar
homework-175721a63b426355274fa9e8063f762020ab8362.tar.gz
homework-175721a63b426355274fa9e8063f762020ab8362.tar.bz2
homework-175721a63b426355274fa9e8063f762020ab8362.tar.lz
homework-175721a63b426355274fa9e8063f762020ab8362.tar.xz
homework-175721a63b426355274fa9e8063f762020ab8362.tar.zst
homework-175721a63b426355274fa9e8063f762020ab8362.zip
R E A R R A N G E
Diffstat (limited to 'ee2301')
-rw-r--r--ee2301/README.md3
-rw-r--r--ee2301/baseConvert.cpp57
-rw-r--r--ee2301/collatz.py21
-rw-r--r--ee2301/hw4.v0
4 files changed, 0 insertions, 81 deletions
diff --git a/ee2301/README.md b/ee2301/README.md
deleted file mode 100644
index 56450fb..0000000
--- a/ee2301/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# IMPORTANT I GUESS
-
-This is not actual HW, just stuff I might have used.
diff --git a/ee2301/baseConvert.cpp b/ee2301/baseConvert.cpp
deleted file mode 100644
index d675741..0000000
--- a/ee2301/baseConvert.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// C program to convert a number from any base
-// to decimal
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
-
-// To return value of a char. For example, 2 is
-// returned for '2'. 10 is returned for 'A', 11
-// for 'B'
-int val(char c)
-{
- if (c >= '0' && c <= '9')
- return (int)c - '0';
- else
- return (int)c - 'A' + 10;
-}
-
-// Function to convert a number from given base 'b'
-// to decimal
-int toDeci(char *str, int base)
-{
- int len = strlen(str);
- int power = 1; // Initialize power of base
- int num = 0; // Initialize result
- int i;
-
- // Decimal equivalent is str[len-1]*1 +
- // str[len-1]*base + str[len-1]*(base^2) + ...
- for (i = len - 1; i >= 0; i--)
- {
- // A digit in input number must be
- // less than number's base
- if (val(str[i]) >= base)
- {
- printf("Invalid Number");
- return -1;
- }
-
- num += val(str[i]) * power;
- power = power * base;
- }
-
- return num;
-}
-
-// Driver code
-int main()
-{
- char str[] = "11A";
- int base = 16;
- printf("Please enter number followed by base: ");
- std::cin >> str >> base;
- printf("Decimal equivalent of %s in base %d is"
- " %d\n",
- str, base, toDeci(str, base));
- return 0;
-}
diff --git a/ee2301/collatz.py b/ee2301/collatz.py
deleted file mode 100644
index 14873be..0000000
--- a/ee2301/collatz.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def collatzCount(number):
- for n in range (1,number+1):
- collatzConjecture(n)
- #print("\n")
-
-def collatzConjecture(n):
- #print(n, end = ' ')
- if n is 1:
- return 1
- else:
- if n%2:
- return collatzConjecture(int((n*3)+1))
- else:
- return collatzConjecture(int(n/2))
- raise AssertionError
-
-
-try:
- collatzCount(10000)
-except AssertionError:
- print("The Collatz Conjecture is false!")
diff --git a/ee2301/hw4.v b/ee2301/hw4.v
deleted file mode 100644
index e69de29..0000000
--- a/ee2301/hw4.v
+++ /dev/null