Compare commits

22 Commits

Author SHA1 Message Date
3675ee066f Adding the C code.
I'm keeping the Java file for now as reference.
2016-07-04 12:43:19 +02:00
f7a0384ff3 Ignore the build directory. 2016-07-04 12:17:21 +02:00
19f9c3c333 Preparing for switch to C. 2016-07-04 12:16:35 +02:00
eebc90e392 Commented Q3 out. 2014-11-06 12:06:59 -06:00
5acd4908ab Update README.md 2014-10-30 15:45:22 -05:00
f022fda0d6 Fixed warning from build. 2014-10-10 11:55:19 -05:00
6d6ef03710 Simplifying comilation. 2014-10-08 19:47:21 -05:00
b5d0d55290 Update .gitignore 2014-09-21 11:25:47 -05:00
81548b20e6 Update README.md 2014-09-21 11:24:23 -05:00
ede6827cb6 Merge branch 'master' of https://github.com/Deathsbreed/MMMCalc 2014-09-21 11:22:57 -05:00
015da8fd34 Now using Apache Ant to compile. 2014-09-21 11:22:22 -05:00
326038107c Update README.md 2014-09-17 21:21:43 -05:00
a1b8f22383 Removed a comment. 2014-06-01 15:40:38 -05:00
fb4d81fe67 Removed FIXME from Q1 function. 2014-05-31 23:51:59 -05:00
497c7d0bea Fixed Q1 calculations (though they could be simplified). 2014-05-31 23:49:00 -05:00
b5db1fbdc2 Forgot to add the gitignore file. 2014-05-31 22:08:03 -05:00
1adc60c991 Added a gitignore file for the binary folder, and moved the manifest to that folder. 2014-05-31 22:06:43 -05:00
4980d8b57c Merge branch 'master' of https://github.com/Deathsbreed/MMMCalc 2014-05-07 15:42:40 -05:00
8d048e9a68 Trying to rever this. 2014-05-07 15:42:35 -05:00
f9a739f556 Added FIXME notices for Q1 and Q2
Q1 and Q2 are calculating incorrectly, specifically that they are ignoring the median value.
2014-05-07 11:03:00 -05:00
3b24d422d2 Preparing for version 0.4 2014-04-15 13:41:35 -05:00
e8b1d79f79 Oops, forgot to change the version. Oh well, minor details. 2014-04-14 17:50:36 -05:00
7 changed files with 98 additions and 30 deletions

8
.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Ignore CMake files:
CMakeCache.txt
CMakeFiles/
cmake_install.cmake
Makefile
# Ignore build files:
build/

13
CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
cmake_minimum_required(VERSION 2.6)
project(MMMCalc)
set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic-errors")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -O0")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -O3")
set(CMAKE_C_FLAGS_MIN_SIZEREL "${CMAKE_C_FLAGS} -Os")
set(SRCS
src/Main.c)
add_executable(mmmcalc ${SRCS})

View File

@ -1,12 +1,16 @@
MMMCalc
=======
This is a very simple project, it was made for educational purposes (hence why it is open-source), and I encourage everyone to contribute if they have something to add.
### Compiling
MMMCalc uses [CMake](http://cmake.org/) to compile. Please install the C development tools and CMake (along with whichever build script you plan on having CMake generate) in order to run this command.
```bash
$ cd build/
$ cmake ..
$ make
```
The most simple way to build this project is to move to the src folder/directory and run
### Contributing
To contribute, simply open a pull request, however, be aware that this code is licensed under a GNU GPLv3 and so will yours.
$ javac MMMCalc.java
This will allow you to build the project that should work properly if you are downloading one of the releases (if you download the straight from the master branch it might have some problems).
To contact me, send me an e-mail at <nicolas.ortega.froysa@gmail.com>.
### License
All code in this repository is under the [GNU GPLv3](/LICENSE).

0
build/.keep Normal file
View File

14
src/Main.c Normal file
View File

@ -0,0 +1,14 @@
#include <stdio.h>
// 0 = false;
// 1 = true;
char version[16] = "v0.5";
int verbose = 0;
int main(int argc, char **argv) {
printf("MMMCalc %s, Copyright (c) 2016 Nicolás A. Ortega.\n", version);
printf("This program comes with ABSOLUTELY NO WARRANTY.\n");
printf("This program is free software and you are welcome to redistribute\n");
printf("under the terms and conditions of the GNU GPLv3 or higher.\n\n");
return 0;
}

View File

@ -1,2 +0,0 @@
Manifest-Version: 0.2
Main-Class: MMMCalc

View File

@ -1,3 +1,5 @@
package mmmcalc;
import java.lang.Math;
import java.util.Arrays;
import java.util.HashMap;
@ -6,7 +8,7 @@ import java.util.Map;
/**
* @author Nicolás A. Ortega
* @copyright (C) Nicolás A. Ortega
* @license GNU General Public License 3.0 (GPLv3)
* @license GNU GPLv3
* @year 2014
*
*/
@ -23,7 +25,7 @@ public class MMMCalc {
private static float variance = 0;
public static void main(String[] args) {
System.out.println("MMMCalc v0.2, Copyright (C) 2014 Nicolás A. Ortega\n" +
System.out.println("MMMCalc v0.4, Copyright (C) 2014 Nicolás A. Ortega\n" +
"This program comes with ABSOLUTELY NO WARRANTY; for details use '-w'\n" +
"This is free software, and you are welcome to redistribute it\n" +
"under certain conditions; use '-c' for details.\n");
@ -135,30 +137,58 @@ public class MMMCalc {
}
private static void calcQ1() {
int q1Pos = numArray.length / 4;
boolean exact;
int q1Pos;
// c stands for case... Cases correspond to their order in the following if statements (4 different cases).
int c;
if(numArray.length % 4 == 0) {
if(numArray.length % 2.0 == 0) {
q1Pos = (int)(numArray.length / 4);
if(numArray.length % 4.0 == 0) {
q1 = (numArray[q1Pos] + numArray[q1Pos-1]) / 2;
exact = false;
c = 1;
} else {
q1 = numArray[q1Pos];
exact = true;
c = 2;
}
} else {
if(Math.ceil(numArray.length / 2.0) % 2.0 == 0) {
q1Pos = (int)(Math.ceil(numArray.length / 2.0) / 2.0);
q1 = (numArray[q1Pos] + numArray[q1Pos+1]) / 2;
c = 3;
} else {
q1Pos = (int)Math.ceil(numArray.length / 4.0);
q1 = numArray[q1Pos];
c = 4;
}
}
System.out.println("Q1: " + q1);
if(verbose) {
for(int i = 0; i < numArray.length; i++) {
if(!exact) {
if(c == 1) {
if(i == q1Pos - 1) {
System.out.print(">>" + numArray[i] + " !" + q1 + "! ");
} else if( i == q1Pos) {
} else if(i == q1Pos) {
System.out.print(numArray[i] + "<< ");
} else {
System.out.print(numArray[i] + " ");
}
} else if(c == 2) {
if(i == q1Pos) {
System.out.print(">>" + numArray[i] + "<< ");
} else {
System.out.print(numArray[i] + " ");
}
} else if(c == 3) {
if(i == q1Pos) {
System.out.print(">>" + numArray[i] + " !" + q1 + "! ");
} else if(i == q1Pos + 1) {
System.out.print(numArray[i] + "<< ");
} else {
System.out.print(numArray[i] + " ");
}
} else if(c == 4) {
if(i == q1Pos) {
System.out.print(">>" + numArray[i] + "<< ");
} else {
@ -206,12 +236,13 @@ public class MMMCalc {
}
}
// FIXME: Needs to calculate haflway between the median value and the last value.
private static void calcQ3() {
int q3Pos = (numArray.length * 3) / 4;
/*int q3Pos = (numArray.length * 3) / 4;
boolean exact;
if((numArray.length * 3) % 4 == 0) {
q3 = (numArray[q3Pos] + numArray[q3Pos-1]) / 2;
if((numArray.length * 3) % 4 != 0) {
q3 = (numArray[q3Pos+1] + numArray[q3Pos]) / 2;
exact = false;
} else {
q3 = numArray[q3Pos];
@ -223,9 +254,9 @@ public class MMMCalc {
if(verbose) {
for(int i = 0; i < numArray.length; i++) {
if(!exact) {
if(i == q3Pos - 1) {
if(i == q3Pos) {
System.out.print(">>" + numArray[i] + " !" + q3 + "! ");
} else if(i == q3Pos) {
} else if(i == q3Pos + 1) {
System.out.print(numArray[i] + "<< ");
} else {
System.out.print(numArray[i] + " ");
@ -239,7 +270,8 @@ public class MMMCalc {
}
}
System.out.print("\n\n");
}
}*/
System.out.println("Q3 is not currently functional.\n");
}
private static void calcMode() {
@ -308,7 +340,6 @@ public class MMMCalc {
}
private static void calcVariance() {
// NOTE: I'm doing it this way so I don't have to convert the variables to doubles and lose precision.
variance = stdDev * stdDev;
System.out.println("Variance: " + variance);