From a715dcebb5d0fc5a1849ac19e03bd27dc580d832 Mon Sep 17 00:00:00 2001 From: Jon Lindell Date: Wed, 19 Apr 2017 09:42:35 -0600 Subject: [PATCH 1/2] fixing test to use problem.js instead of solution.js --- w03/w3-r-sum-of-numbers/problem.js | 9 ++++----- w03/w3-r-sum-of-numbers/test/r-test.js | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/w03/w3-r-sum-of-numbers/problem.js b/w03/w3-r-sum-of-numbers/problem.js index 9b2a899..c8d7c1e 100644 --- a/w03/w3-r-sum-of-numbers/problem.js +++ b/w03/w3-r-sum-of-numbers/problem.js @@ -1,10 +1,10 @@ -/* Given two integers, which can be positive and negative, +/* Given two integers, which can be positive and negative, find the sum of all the numbers between and including a and b, and return the sum. If both numbers are equal return a or b. Note! a and b are not ordered! -Example: +Example: getSum(1, 0) == 1 // 1 + 0 = 1 getSum(1, 2) == 3 // 1 + 2 = 3 getSum(0, 1) == 1 // 0 + 1 = 1 @@ -14,6 +14,7 @@ getSum(-1, 2) == 2 // -1 + 0 + 1 + 2 = 2 */ function getSum( a, b ) { + //your code here } // END FUNCTION @@ -21,6 +22,4 @@ function getSum( a, b ) { module.exports = { getSum:getSum, attendance:"WORD UP" -} - - +}; diff --git a/w03/w3-r-sum-of-numbers/test/r-test.js b/w03/w3-r-sum-of-numbers/test/r-test.js index b1890d8..2bf2f13 100644 --- a/w03/w3-r-sum-of-numbers/test/r-test.js +++ b/w03/w3-r-sum-of-numbers/test/r-test.js @@ -1,19 +1,19 @@ var expect = require("chai").expect; -var getSum = require("../solution").getSum; -console.log(getSum.toString(), "TYLRERERKJERHKEJRHKJ") +var getSum = require("../problem").getSum; +console.log(getSum.toString(), "TYLRERERKJERHKEJRHKJ"); describe("getSum warmup", function() { it("should return the same number if a and b are equal", function () { - expect(getSum(1, 1)).to.be.equal(1) - expect(getSum(7, 7)).to.be.equal(7) - expect(getSum(2928, 2928)).to.be.equal(2928) - }) + expect(getSum(1, 1)).to.be.equal(1); + expect(getSum(7, 7)).to.be.equal(7); + expect(getSum(2928, 2928)).to.be.equal(2928); + }); it("should return the addition of each number between and including a & b", function () { - expect(getSum(-1, 2)).to.be.equal(2) - expect(getSum(-10, 2)).to.be.equal(-52) - expect(getSum(77, -77)).to.be.equal(0) - expect(getSum(5, -7)).to.be.equal(-13) - expect(getSum(34554, 2)).to.be.equal(597006734) - }) -}) + expect(getSum(-1, 2)).to.be.equal(2); + expect(getSum(-10, 2)).to.be.equal(-52); + expect(getSum(77, -77)).to.be.equal(0); + expect(getSum(5, -7)).to.be.equal(-13); + expect(getSum(34554, 2)).to.be.equal(597006734); + }); +}); From 9e90522820a904fa27222df25aeafee5196f4477 Mon Sep 17 00:00:00 2001 From: Jon Lindell Date: Wed, 19 Apr 2017 09:52:10 -0600 Subject: [PATCH 2/2] solved sum of numbers --- w03/w3-r-sum-of-numbers/problem.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/w03/w3-r-sum-of-numbers/problem.js b/w03/w3-r-sum-of-numbers/problem.js index c8d7c1e..5730421 100644 --- a/w03/w3-r-sum-of-numbers/problem.js +++ b/w03/w3-r-sum-of-numbers/problem.js @@ -14,7 +14,19 @@ getSum(-1, 2) == 2 // -1 + 0 + 1 + 2 = 2 */ function getSum( a, b ) { - //your code here + if(a === b){ + return a; + } + if(b < a){ + let temp = b; + b = a; + a = temp; + } + var answer = 0; + for (i = a; i <= b; i++) { + answer += i; + } + return answer; } // END FUNCTION