Minor fixes for example inputs

This commit is contained in:
Alex Hirsch 2019-01-07 13:24:22 +01:00
parent 2e5a0dbdcc
commit 9a84902011
9 changed files with 73 additions and 80 deletions

View File

@ -1,4 +1,4 @@
int main() int main()
{ {
return 0; return 0;
} }

View File

@ -16,7 +16,7 @@ int main()
if (Vbat < 0.0) { if (Vbat < 0.0) {
print("Please plug the battery in the right way"); print("Please plug the battery in the right way");
print_nl(); print_nl();
return; return 1;
} }
print("Resistor value: "); print("Resistor value: ");
@ -28,7 +28,7 @@ int main()
if (R < 0.0 || C < 0.0) { if (R < 0.0 || C < 0.0) {
print("Part values must be positive"); print("Part values must be positive");
print_nl(); print_nl();
return; return 1;
} }
print("Time step: "); print("Time step: ");
@ -47,7 +47,7 @@ int main()
if (dt < 0.0 || iter < 0) { if (dt < 0.0 || iter < 0) {
print("Cowardly refusing to go backwards in time"); print("Cowardly refusing to go backwards in time");
print_nl(); print_nl();
return; return 1;
} }
Vc = 0.0; Vc = 0.0;
@ -68,5 +68,5 @@ int main()
iter = iter - 1; iter = iter - 1;
} }
return 0; return 0;
} }

View File

@ -1,12 +1,10 @@
float kth(float k) float kth(float k)
{ {
return 1.0 / (2.0 * k + 1.0); return 1.0 / (2.0 * k + 1.0);
} }
int main() int main()
{ {
print("Please enter a number: "); print("Please enter a number: ");
float sign; float sign;

View File

@ -1,15 +1,14 @@
void lucas_number (int x, int y, int num){ void lucas_number (int x, int y, int num)
int z; {
z=0; int z;
while(num >= x) z=0;
{ while(num >= x) {
print_int(x); print_int(x);
print(", "); print(", ");
z=x+y; z=x+y;
x=y; x=y;
y=z; y=z;
} }
} }
int main() int main()

View File

@ -1,18 +1,14 @@
float transform_x(float x) float transform_x(float x)
{ {
float fx; float fx;
fx = x; fx = x;
return (-2.0) + ((1.0) - (-2.0)) * (fx / 80.0); return (-2.0) + ((1.0) - (-2.0)) * (fx / 80.0);
} }
float transform_y(float y) float transform_y(float y)
{ {
float fy; float fy;
fy = y; fy = y;
return ((1.0) - ((1.0) - (-1.0)) * (fy / 50.0)) * 2.0; return ((1.0) - ((1.0) - (-1.0)) * (fy / 50.0)) * 2.0;
} }

View File

@ -1,30 +1,30 @@
/* Test booleans and greater/smaller comparisons */ /* Test booleans and greater/smaller comparisons */
void guessNumber(int number, int max) { void guessNumber(int number, int max) {
bool success; bool success;
success = false; success = false;
while(!success) { while(!success) {
print("Enter a number between 0 and "); print("Enter a number between 0 and ");
print_int(max); print_int(max);
print("\n"); print("\n");
int guess; int guess;
guess = read_int(); guess = read_int();
success = guess == number; success = guess == number;
if(success) if(success)
print("you guessed correct"); print("you guessed correct");
else { else {
if(guess < number) if(guess < number)
print("the number is bigger\n"); print("the number is bigger\n");
else else
print("the number is smaller\n"); print("the number is smaller\n");
} }
} }
print_nl(); print_nl();
} }
int main() { int main() {
int test; int test;
test = 3; test = 3;
guessNumber(test, 10); guessNumber(test, 10);
return 0; return 0;
} }

View File

@ -1,17 +1,16 @@
int is_prime(int n){ int is_prime(int n)
{
int i; int i;
i = 2; i = 2;
int mod; int mod;
while (i < n/2) while (i < n / 2) {
{ mod = n - (n / i) * i;
mod = n - (n/i)*i; if (mod == 0) {
if(mod == 0){ return 0;
return 0; }
} i = i + 1;
i = i +1; }
} return 1;
return 1;
} }
int main() int main()
@ -31,5 +30,5 @@ int main()
print_int(result); print_int(result);
print_nl(); print_nl();
return 0; return 0;
} }

View File

@ -1,43 +1,44 @@
/* this example sorts 4 numbers like in an sorting network */ /* this example sorts 4 numbers like in an sorting network */
void sort(int a, int b, int c, int d) { void sort(int a, int b, int c, int d) {
int tmp; int tmp;
if(a > c) { tmp = c; c = a; a = tmp; } if(a > c) { tmp = c; c = a; a = tmp; }
if(b > d) { tmp = d; d = b; b = tmp; } else {} if(b > d) { tmp = d; d = b; b = tmp; } else {}
if(a > b) {tmp = b; b = a; a = tmp; } if(a > b) {tmp = b; b = a; a = tmp; }
if(c > d) { tmp = d; d = c; c = tmp; } if(c > d) { tmp = d; d = c; c = tmp; }
if(b > c) { tmp = c; c = b; b = tmp; } if(b > c) { tmp = c; c = b; b = tmp; }
print_int(a); print_int(b); print_int(c); print_int(d); print_nl(); print_int(a); print_int(b); print_int(c); print_int(d); print_nl();
} }
int main() { int main() {
string info; info = "Enter a number which should be sorted within 1, 26 and 77:"; string info; info = "Enter a number which should be sorted within 1, 26 and 77:";
print(info); print_nl(); print(info); print_nl();
int a; a = read_int(); int a; a = read_int();
int b; b = 26; int b; b = 26;
int c; c = 77; int c; c = 77;
int d; d = 1; int d; d = 1;
{ {
{ {
sort(a, b, c, d); sort(a, b, c, d);
sort(a, b, d, c); sort(a, b, d, c);
sort(a, c, b, d); sort(a, c, b, d);
sort(a, c, d, b); sort(a, c, d, b);
sort(c, b, a, d); sort(c, b, a, d);
sort(c, b, d, a); sort(c, b, d, a);
sort(b, c, d, a); sort(b, c, d, a);
sort(b, c, a, d); sort(b, c, a, d);
sort(b, a, c, d); sort(b, a, c, d);
sort(b, a, d, c); sort(b, a, d, c);
sort(b, d, a, c); sort(b, d, a, c);
sort(b, d, c, a); sort(b, d, c, a);
sort(d, a, b, c); sort(d, a, b, c);
sort(d, a, c, b); sort(d, a, c, b);
sort(d, c, a, b); sort(d, c, a, b);
sort(d, b, a, c); sort(d, b, a, c);
/* .*./. */ /* .*./. */
} }
} }
return 0; return 0;
} }

View File

@ -38,5 +38,5 @@ int main() {
print_float(pi); print_float(pi);
print_nl(); print_nl();
return 0; return 0;
} }