forked from AdaGold/calculator
-
Notifications
You must be signed in to change notification settings - Fork 49
Time - Mair #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mheshmati-tech
wants to merge
1
commit into
Ada-C13:master
Choose a base branch
from
mheshmati-tech:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Time - Mair #32
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| #define the operation to use for calculation later | ||
| def add(a,b) | ||
| return a + b | ||
| end | ||
|
|
||
| def subtract(a,b) | ||
| return a - b | ||
| end | ||
|
|
||
| def multiply(a,b) | ||
| return a * b | ||
| end | ||
|
|
||
| def divide(a,b) | ||
| return a / b | ||
| end | ||
|
|
||
|
|
||
| #introduce the program | ||
| puts "Welcome to the calculator program where you are able to either add, subtract, divide, or multiply two numbers." | ||
|
|
||
| #take in the numbers and operation the user would like to perform | ||
| puts "Input your first number--" | ||
| num_1=gets.chomp | ||
|
|
||
| #validate their input is actually a number | ||
| until num_1.to_i.to_s == num_1 || num_1.to_f.to_s == num_1 | ||
| puts "Please only enter a valid number" | ||
| num_1 = gets.chomp | ||
| end | ||
| num_1 = num_1.to_f | ||
|
|
||
| puts "Input the operator you would to use: enter 'add' or '+', 'subtract' or '-', 'divide' or '/', or 'multiply' or '*':" | ||
| command=gets.chomp | ||
|
|
||
| #verify their input is a valid operator | ||
| until %w(add + subtract - divide / multiply *).include? (command) | ||
| puts "Please choose a valid operation from the following choices: 'add'/'+', 'subtract'/'-', 'divide'/''/', or 'multiply'/'*' " | ||
| command=gets.chomp | ||
| end | ||
|
|
||
| puts "Input your second number--" | ||
| num_2=gets.chomp | ||
|
|
||
| #verify their second input is a number | ||
| until num_2.to_i.to_s == num_2 || num_2.to_f.to_s == num_2 | ||
| puts "Please only enter a valid number" | ||
| num_2 = gets.chomp | ||
| end | ||
| num_2= num_2.to_f | ||
|
|
||
| #use user inputs to perform the calculations | ||
| case command | ||
| when "add", "+" | ||
| puts add(num_1, num_2) | ||
| when "subtract", "-" | ||
| puts subtract(num_1, num_2) | ||
| when "divide", "/" | ||
| if num_2 == 0 #if the user wants to divide a number by zero | ||
| puts "0" | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider printing a more informative message. |
||
| else | ||
| puts divide(num_1, num_2) | ||
| end | ||
| when "multiply", "*" | ||
| puts multiply(num_1,num_2) | ||
| end | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice work making sure the user input is valid! This code is repeated below for the second number -- as such this would be a great opportunity to use a method to DRY up your code.