From 175721a63b426355274fa9e8063f762020ab8362 Mon Sep 17 00:00:00 2001 From: RossTheRoss Date: Thu, 30 Jan 2020 16:55:04 -0600 Subject: R E A R R A N G E --- ee2301/README.md | 3 --- ee2301/baseConvert.cpp | 57 -------------------------------------------------- ee2301/collatz.py | 21 ------------------- ee2301/hw4.v | 0 4 files changed, 81 deletions(-) delete mode 100644 ee2301/README.md delete mode 100644 ee2301/baseConvert.cpp delete mode 100644 ee2301/collatz.py delete mode 100644 ee2301/hw4.v (limited to 'ee2301') 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 -#include -#include - -// 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 -- cgit v1.2.3