Code

Simple Calculator#97

Code

Open

k-romero wants to merge 16 commits intoZipCodeCore:masterZipCodeCore/ScientificCalculator:masterfrom k-romero:masterk-romero/ScientificCalculator.Maven:masterCopy head branch name to clipboard

+476-15

Commits

Commits on Feb 8, 2020

• making first changes in calc

  k-romero

  committed
  b694750

• created while loop to ask for correct user input

  k-romero

  committed
  5d7d0b4

• updated file structure

  k-romero

  committed
  064ebbd

• Updated display and user prompts

  k-romero

  committed
  a63c21a

• Updated code with Sandy and Dave's methods / work now trying to figure out how to update their branches per the master file

  k-romero

  committed
  7656828

Commits on Feb 9, 2020

• created new class Calculator, Updated MainApp to call new instance of object Calculator, Started to call methods based off user inputs

  k-romero

  committed
  844f8d1

• Added Sandy and Daves changes to the master

  k-romero

  committed
  1dd53f7

• created second while loop inside first

  k-romero

  committed
  53f8fd9

• created clear function...sort of

  k-romero

  committed
  73e8ac0

• we realized as a team we were approaching this in the wrong way, so we are starting to break up the code and spread it out between our different classes

  k-romero

  committed
  45187ab

• added Sandy's Test cases...we still dont know how to totally work with git and github

  k-romero

  committed
  bb4cae9

• cleaning up some of the code

  k-romero

  committed
  ecef328

• Fixed variableexpo if statement

  k-romero

  committed
  e668a7c

Commits on Feb 10, 2020

• added all the unused math function that Dave wrote and I created the M+ MC MRC features

  k-romero

  committed
  9290de3

• Sandy added more tests

  k-romero

  committed
  5790704

• made a change?

  k-romero

  committed
  0fae80d