diff --git a/ProblemSelection.ts b/ProblemSelection.ts index 5b80ca6..4ae8db5 100644 --- a/ProblemSelection.ts +++ b/ProblemSelection.ts @@ -25,17 +25,19 @@ const readlineSync = require("readline-sync"); import { Problem } from "./Problems/Problem"; import { Problem1 } from "./Problems/Problem1"; +import { Problem2 } from "./Problems/Problem2"; export class ProblemSelection{ //Holds the valid problem numbers - public static PROBLEM_NUMBERS = [1]; + public static PROBLEM_NUMBERS: number[] = [1, 2]; //Returns the problem corresponding to the given problem number public static getProblem(problemNumber: number): Problem{ let problem: Problem = null; switch(problemNumber){ - case 1 : problem = new Problem1(); break; + case 1 : problem = new Problem1(); break; + case 2 : problem = new Problem2(); break; } return problem; } diff --git a/Problems/Problem2.ts b/Problems/Problem2.ts new file mode 100644 index 0000000..41c55a0 --- /dev/null +++ b/Problems/Problem2.ts @@ -0,0 +1,95 @@ +//ProjectEulerTS/Problems/Problem2.ts +//Matthew Ellison +// Created: 10-19-20 +//Modified: 10-19-20 +//The sum of the even Fibonacci numbers less than 4,000,000 +//Unless otherwise listed all non-standard includes are my own creation and available from https://bibucket.org/Mattrixwv/typescriptClasses +/* + Copyright (C) 2020 Matthew Ellison + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . +*/ + + +import { Problem } from "./Problem"; +import { getAllFib } from "../../../Typescript/typescriptClasses/Algorithms"; +import { Unsolved } from "../Unsolved"; + + +export class Problem2 extends Problem{ + //Variables + //Static variables + private static TOP_NUM: number = 4000000 - 1; //The largest number that will be checked as a fibonacci number + //Instance variables + private fullSum: number; //Holds the sum of all the numbers + + //Functions + //Constructor + public constructor(){ + super(`What is the sum of the even Fibonacci numbers less than ${Problem2.TOP_NUM + 1}`); + this.fullSum = 0; + } + //Operational functions + //Solve the problem + public solve(): void{ + //If the problem has already been solved do nothing and end the function + if(this.solved){ + return; + } + + //Start the timer + this.timer.start(); + + //Get a list of all fibonacci numbers <= TOP_NUM + let fibNums = getAllFib(Problem2.TOP_NUM); + //Setp through every element in the list checking ifit is even + fibNums.forEach(num => { + //If the number is even add it to the running tally + if((num % 2) == 0){ + this.fullSum += num; + } + }); + + //Stop the timer + this.timer.stop(); + + //Throw a flag to show the problem is solved + this.solved = true; + } + //Reset the problem so it can be run again + public reset(): void{ + super.reset(); + this.fullSum = 0; + } + //Gets + //Returns the result of solving the problem + public getResult(): string{ + if(!this.solved){ + throw new Unsolved(); + } + return `The sum of all even fibonacci numbers <= ${Problem2.TOP_NUM} is ${this.fullSum}`; + } + //Returns the requested sum + public getSum(): number{ + if(!this.solved){ + throw new Unsolved(); + } + return this.fullSum; + } +} + +/* Results: +The sum of all even fibonacci numbers <= 3999999 is 4613732 +It took an average of 6.330 microseconds to run this problem through 100 iterations +*/