azalea/GetGoing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main

Browse Source
This commit is contained in:
Aaron
2021-01-21 14:31:34 -05:00
parent e41c0ea067 431650c366
commit 751c92fe14
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ProjectClock/MathExpressions.swift
+7 -3
View File
@@ -118,15 +118,19 @@ let c = MathExpression.random()
} }
} }
class QuadraticProb{
//generates the roots
let root1 = Int.random(in: 1...10)//ax^2
let root2 = Int.random(in: 1...10)//bx
class QuadraticProb{ class QuadraticProb{
let a = Int.random(in: 1...10)//ax^2 let a = Int.random(in: 1...10)//ax^2
let b = Int.random(in: 1...10)//bx let b = Int.random(in: 1...10)//bx
let c = Int.random(in: 1...10)//c let c = Int.random(in: 1...10)//c
var roots = [Int]() var roots = [Int]()
func getProblem() -> String{ func getProblem() -> String{
return "\(a)x^2 + \(b)x + \(c)" return "\(a)x^2 + \(b)x + \(c)"
} }
@@ -134,7 +138,7 @@ class QuadraticProb{
//finds the roots of the quadratic **NOTE**: the return type is [Int], not a String //finds the roots of the quadratic **NOTE**: the return type is [Int], not a String
func getAnswer() -> [Int]{ func getAnswer() -> [Int]{
let d = Int(pow(Double(b), 2) - 4 * Double(a) * Double(c)) // discriminant let d = Int(pow(Double(b), 2) - 4 * Double(a) * Double(c)) // discriminant
// if d>0 , equation has two distinct real roots exist. // if d>0 , equation has two distinct real roots exist.
if d > 0 { if d > 0 {
let x1 = Int((-Double(b) + sqrt(Double(d)))/(2*Double(a))) let x1 = Int((-Double(b) + sqrt(Double(d)))/(2*Double(a)))