Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Raincode/DeskCalc
Browse files Browse the repository at this point in the history
  • Loading branch information
Raincode committed Jun 5, 2017
2 parents d2761c6 + ca635d7 commit 4b2a85b
Showing 1 changed file with 39 additions and 5 deletions.
44 changes: 39 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,41 @@ Desk(top) Calculator inspired by "The C++ Programming Language" (Stroustrup)
42
>> 2*var + 2var
168
// complex number arithmetic
>> 5i*(3-i) + (1+i) + i^3
6+15i
>> 5*e^(90deg)i + 3*e^(45deg)i - 1*e^(135deg)i
2.82843+6.41421i
>> exp
7.01015*e^(66.2043deg)i
// define functions with multiple variables
>> fn f(a,b,c) = a*b + c
>> f(2,4,3)
11
// define lists and do basic calculations on them
>> x = [1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5]
>> x
[1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5]
>> x = [for i=1, 5:0.5 i]
>> x
[1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5]
>> len(x); avg(x); sum(x)
9
3
27
>> sx(x); ux(x)
1.36931
0,456435
```

## Features
* Variables
* Functions (multiple parameters possible)
* Complex Number arithmetic
* Minimal list support

## Built-in Constants
pi, e, i, deg (will convert to rad, so you can write sin(90deg))
Expand All @@ -35,8 +64,13 @@ __Complex:__ Re, Im, arg, abs, norm
__Misc.:__ ln, log, sqr, sqrt, cbrt, round, ceil, floor, trunc

## Commands
* __copy__
* __copy,__
* __bin__
* __dec__
* __hex__
* __copy:__ Copy the last result to clipboard using '.' as decimal point
* __copy,:__ Copy the last result to clipboard using ',' as decimal point
* __bin:__ Output a hexadecimal or decimal number as binary
* __dec:__ Output a hexadecimal or binary number as decimal
* __hex:__ Output a decimal or binary number as hexadecimal
* __clear/cls:__ Clears the screen from previous results
* __clear (all | vars | funcs | lists):__ Removes all user-defined variables/functions/lists
* __run:__ Run a DeskCalc file while running the CLI
* __ls:__ List variables, user-defined functions and lists
* __exp:__ Output last result in expontential Form r*e^(tetha in °)i

0 comments on commit 4b2a85b

Please sign in to comment.