skuska2
This commit is contained in:
parent
80b330f482
commit
ea0d06c058
@ -4,7 +4,7 @@ OBJ=main.o calculator.o
|
|||||||
|
|
||||||
all: calculator
|
all: calculator
|
||||||
|
|
||||||
kalkulacka: $(OBJ)
|
calculator: $(OBJ)
|
||||||
$(CC) $(CFLAGS) -o calculator $(OBJ) -lm
|
$(CC) $(CFLAGS) -o calculator $(OBJ) -lm
|
||||||
|
|
||||||
main.o: main.c calculator.h
|
main.o: main.c calculator.h
|
||||||
|
@ -29,7 +29,7 @@ double del(double a, double b) { return a / b; }
|
|||||||
double sin(double x) { return sin(x); }
|
double sin(double x) { return sin(x); }
|
||||||
double cos(double x) { return cos(x); }
|
double cos(double x) { return cos(x); }
|
||||||
double sqrt(double x) { return sqrt(x); }
|
double sqrt(double x) { return sqrt(x); }
|
||||||
double pow(double zaklad, double exponent) { return pow(zaklad, exponent); }
|
double mocnina(double zaklad, double exponent) { return pow(zaklad, exponent); }
|
||||||
double log(double x) { return log(x); }
|
double log(double x) { return log(x); }
|
||||||
|
|
||||||
// Funkcia na konverziu infixového výrazu na postfixový (Shunting-yard algoritmus)
|
// Funkcia na konverziu infixového výrazu na postfixový (Shunting-yard algoritmus)
|
||||||
|
Loading…
Reference in New Issue
Block a user