diff --git a/les3/MT3C/DecoratorTextfield/dev/XxxXName.ts b/les3/MT3C/DecoratorTextfield/dev/XxxXName.ts new file mode 100644 index 0000000..50a4e5c --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/XxxXName.ts @@ -0,0 +1,18 @@ +/// + +class XxxXName extends TextObject +{ + private base : TextObject = null; + + constructor(base:TextObject) + { + super(); + + this.base = base; + } + + public toString(): string + { + return "Xx" + this.base.toString() + "xX"; + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/capsName.ts b/les3/MT3C/DecoratorTextfield/dev/capsName.ts new file mode 100644 index 0000000..837a456 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/capsName.ts @@ -0,0 +1,18 @@ +/// + +class CapsName extends TextObject +{ + private base : TextObject = null; + + constructor(base:TextObject) + { + super(); + + this.base = base; + } + + public toString(): string + { + return this.base.toString().toUpperCase(); + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/decorators/capital.ts b/les3/MT3C/DecoratorTextfield/dev/decorators/capital.ts new file mode 100644 index 0000000..b410e52 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/decorators/capital.ts @@ -0,0 +1,17 @@ +/// + +class Capital extends TextDecorator{ + + public getText() : string{ + let splits = this.decoratedTxt.getText().split('. '); + + let newString = ''; + for (let word of splits) { + newString += word.charAt(0).toUpperCase(); + newString += word.substr(1, word.length - 1); + newString += '. '; + + } + return newString; + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/decorators/lowerCase.ts b/les3/MT3C/DecoratorTextfield/dev/decorators/lowerCase.ts new file mode 100644 index 0000000..669b9c2 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/decorators/lowerCase.ts @@ -0,0 +1,6 @@ +class LowerCase extends TextDecorator{ + + public getText() : string{ + return this.decoratedTxt.getText().toLowerCase(); + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/decorators/reverse.ts b/les3/MT3C/DecoratorTextfield/dev/decorators/reverse.ts new file mode 100644 index 0000000..07c7525 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/decorators/reverse.ts @@ -0,0 +1,12 @@ +class Reverse extends TextDecorator{ + + public getText() : string{ + let text = this.decoratedTxt.getText(); + + let newString = ''; + for (let i = text.length - 1; i >= 0; i--) { + newString += text[i]; + } + return newString; + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/decorators/summary.ts b/les3/MT3C/DecoratorTextfield/dev/decorators/summary.ts new file mode 100644 index 0000000..bf2a72a --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/decorators/summary.ts @@ -0,0 +1,7 @@ +class Summary extends TextDecorator{ + + public getText() : string{ + let words = this.decoratedTxt.getText().split(' ', 10); + return words.join(' '); + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/extensions.ts b/les3/MT3C/DecoratorTextfield/dev/extensions.ts new file mode 100644 index 0000000..360d1b1 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/extensions.ts @@ -0,0 +1,17 @@ +interface String +{ + shuffle():string; +} + +String.prototype.shuffle = function () { + var a = this.split(""), + n = a.length; + + for(var i = n - 1; i > 0; i--) { + var j = Math.floor(Math.random() * (i + 1)); + var tmp = a[i]; + a[i] = a[j]; + a[j] = tmp; + } + return a.join(""); +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/leetName.ts b/les3/MT3C/DecoratorTextfield/dev/leetName.ts new file mode 100644 index 0000000..51ba37c --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/leetName.ts @@ -0,0 +1,24 @@ +/// + +class LeetName extends TextObject +{ + private base : TextObject = null; + + constructor(base:TextObject) + { + super(); + + this.base = base; + } + + public toString(): string + { + let baseStr = this.base.toString(); + + return baseStr.replace(/l/gi, "1") + .replace(/e/gi, "3") + .replace(/t/gi, "7") + .replace(/o/gi, "0") + .replace(/a/gi, "4"); + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/main.ts b/les3/MT3C/DecoratorTextfield/dev/main.ts index 6c882ae..b02908d 100755 --- a/les3/MT3C/DecoratorTextfield/dev/main.ts +++ b/les3/MT3C/DecoratorTextfield/dev/main.ts @@ -10,30 +10,64 @@ function handleSubmit(e) { let text = form.search.value; +<<<<<<< HEAD // Textobject + var rawString : Txt = new RawString(text); if(form.lowercase.checked) { console.log("Alle karakters naar lowercase"); + rawString = new LowerCase(rawString); } if(form.summary.checked) { console.log("Alleen de eerste 10 woorden van de string"); - + rawString = new Summary(rawString); } if(form.capital.checked) { console.log("Na elke punt spatie een hoofdletter"); - + rawString = new Capital(rawString); } if(form.reverse.checked) { console.log("De tekst achterstevoren."); + rawString = new Reverse(rawString); + } + + // student Decorators + if(form.removevowels.checked) { + console.log("klinkers verwijderen"); + rawString = new RemoveVowels(rawString); +======= + let name = new Name(); + name.text = text; + + if(form.Scrambled.checked) { + name = new ScrambledName(name); + + } + + if(form.to1337.checked) { + name = new LeetName(name); } + if(form.FULLCAPS.checked) { + name = new CapsName(name); + } + + if(form.XxxX.checked) { + name = new XxxXName(name); +>>>>>>> bpikaar/master + } + let output = document.getElementById("output"); output.style.display = "block"; - //output.innerHTML = +<<<<<<< HEAD + output.innerHTML = rawString.getText(); +======= + output.innerText = name.toString(); +>>>>>>> bpikaar/master } \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/name.ts b/les3/MT3C/DecoratorTextfield/dev/name.ts new file mode 100644 index 0000000..d38ad4d --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/name.ts @@ -0,0 +1,13 @@ +/// +class Name extends TextObject +{ + constructor() + { + super(); + } + + public toString(): string + { + return this.text; + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/rawString.ts b/les3/MT3C/DecoratorTextfield/dev/rawString.ts new file mode 100644 index 0000000..ee918ef --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/rawString.ts @@ -0,0 +1,12 @@ +class RawString implements Txt{ + + private _rawString : string; + + constructor(text : string) { + this._rawString = text; + } + + public getText() : string { + return this._rawString + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/scrambledName.ts b/les3/MT3C/DecoratorTextfield/dev/scrambledName.ts new file mode 100644 index 0000000..055eed3 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/scrambledName.ts @@ -0,0 +1,18 @@ +/// + +class ScrambledName extends TextObject +{ + private base : TextObject = null; + + constructor(base:TextObject) + { + super(); + + this.base = base; + } + + public toString(): string + { + return this.base.toString().shuffle(); + } +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/studentDecorators/removeVowels.ts b/les3/MT3C/DecoratorTextfield/dev/studentDecorators/removeVowels.ts new file mode 100644 index 0000000..d71dff7 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/studentDecorators/removeVowels.ts @@ -0,0 +1,18 @@ + +/// +class RemoveVowels extends TextDecorator { + public getText() : string{ + let splits = this.decoratedTxt.getText().split(''); + + let newString = ''; + for (let letter of splits) { + + if (letter == "a" || letter == "e" || letter == "i" || letter == "o" || letter == "u"){ + + } else { + newString += letter; + } + } + return newString; + } +} diff --git a/les3/MT3C/DecoratorTextfield/dev/text.ts b/les3/MT3C/DecoratorTextfield/dev/text.ts deleted file mode 100644 index a3ff07e..0000000 --- a/les3/MT3C/DecoratorTextfield/dev/text.ts +++ /dev/null @@ -1,3 +0,0 @@ -interface Txt { - getText() : string; -} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/textDecorator.ts b/les3/MT3C/DecoratorTextfield/dev/textDecorator.ts new file mode 100644 index 0000000..8b4d0d7 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/textDecorator.ts @@ -0,0 +1,14 @@ +abstract class TextDecorator implements Txt{ + + private decoratedText : Txt; + + public get decoratedTxt(): Txt { + return this.decoratedText; + } + + constructor(decoratedTxt : Txt) { + this.decoratedText = decoratedTxt; + } + + public abstract getText() : string; +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dev/textObject.ts b/les3/MT3C/DecoratorTextfield/dev/textObject.ts new file mode 100644 index 0000000..e106d52 --- /dev/null +++ b/les3/MT3C/DecoratorTextfield/dev/textObject.ts @@ -0,0 +1,6 @@ +abstract class TextObject +{ + public text : string = ""; + + public abstract toString() : string; +} \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dist/index.html b/les3/MT3C/DecoratorTextfield/dist/index.html index e2be1b8..a5798a8 100755 --- a/les3/MT3C/DecoratorTextfield/dist/index.html +++ b/les3/MT3C/DecoratorTextfield/dist/index.html @@ -10,25 +10,37 @@


diff --git a/les3/MT3C/DecoratorTextfield/dist/js/main.js b/les3/MT3C/DecoratorTextfield/dist/js/main.js index af9a2e2..d451e95 100644 --- a/les3/MT3C/DecoratorTextfield/dist/js/main.js +++ b/les3/MT3C/DecoratorTextfield/dist/js/main.js @@ -1,3 +1,85 @@ +<<<<<<< HEAD +class TextDecorator { + get decoratedTxt() { + return this.decoratedText; + } + constructor(decoratedTxt) { + this.decoratedText = decoratedTxt; + } +} +class Capital extends TextDecorator { + getText() { + let splits = this.decoratedTxt.getText().split('. '); + let newString = ''; + for (let word of splits) { + newString += word.charAt(0).toUpperCase(); + newString += word.substr(1, word.length - 1); + newString += '. '; + } + return newString; + } +} +class LowerCase extends TextDecorator { + getText() { + return this.decoratedTxt.getText().toLowerCase(); + } +} +class Reverse extends TextDecorator { + getText() { + let text = this.decoratedTxt.getText(); + let newString = ''; + for (let i = text.length - 1; i >= 0; i--) { + newString += text[i]; + } + return newString; + } +} +class Summary extends TextDecorator { + getText() { + let words = this.decoratedTxt.getText().split(' ', 10); + return words.join(' '); +======= +class TextObject { + constructor() { + this.text = ""; + } +} +class CapsName extends TextObject { + constructor(base) { + super(); + this.base = null; + this.base = base; + } + toString() { + return this.base.toString().toUpperCase(); + } +} +String.prototype.shuffle = function () { + var a = this.split(""), n = a.length; + for (var i = n - 1; i > 0; i--) { + var j = Math.floor(Math.random() * (i + 1)); + var tmp = a[i]; + a[i] = a[j]; + a[j] = tmp; + } + return a.join(""); +}; +class LeetName extends TextObject { + constructor(base) { + super(); + this.base = null; + this.base = base; + } + toString() { + let baseStr = this.base.toString(); + return baseStr.replace(/l/gi, "1") + .replace(/e/gi, "3") + .replace(/t/gi, "7") + .replace(/o/gi, "0") + .replace(/a/gi, "4"); +>>>>>>> bpikaar/master + } +} window.addEventListener("load", function () { let submit = document.getElementById("submit"); submit.addEventListener("click", handleSubmit); @@ -6,19 +88,98 @@ function handleSubmit(e) { e.preventDefault(); let form = document.getElementById("the-form"); let text = form.search.value; +<<<<<<< HEAD + var rawString = new RawString(text); if (form.lowercase.checked) { console.log("Alle karakters naar lowercase"); + rawString = new LowerCase(rawString); } if (form.summary.checked) { console.log("Alleen de eerste 10 woorden van de string"); + rawString = new Summary(rawString); } if (form.capital.checked) { console.log("Na elke punt spatie een hoofdletter"); + rawString = new Capital(rawString); } if (form.reverse.checked) { console.log("De tekst achterstevoren."); + rawString = new Reverse(rawString); + } + if (form.removevowels.checked) { + console.log("klinkers verwijderen"); + rawString = new RemoveVowels(rawString); } let output = document.getElementById("output"); output.style.display = "block"; + output.innerHTML = rawString.getText(); +} +class RawString { + constructor(text) { + this._rawString = text; + } + getText() { + return this._rawString; + } +} +class RemoveVowels extends TextDecorator { + getText() { + let splits = this.decoratedTxt.getText().split(''); + let newString = ''; + for (let letter of splits) { + if (letter == "a" || letter == "e" || letter == "i" || letter == "o" || letter == "u") { + } + else { + newString += letter; + } + } + return newString; +======= + let name = new Name(); + name.text = text; + if (form.Scrambled.checked) { + name = new ScrambledName(name); + } + if (form.to1337.checked) { + name = new LeetName(name); + } + if (form.FULLCAPS.checked) { + name = new CapsName(name); + } + if (form.XxxX.checked) { + name = new XxxXName(name); + } + let output = document.getElementById("output"); + output.style.display = "block"; + output.innerText = name.toString(); +} +class Name extends TextObject { + constructor() { + super(); + } + toString() { + return this.text; + } +} +class ScrambledName extends TextObject { + constructor(base) { + super(); + this.base = null; + this.base = base; + } + toString() { + return this.base.toString().shuffle(); + } +} +class XxxXName extends TextObject { + constructor(base) { + super(); + this.base = null; + this.base = base; + } + toString() { + return "Xx" + this.base.toString() + "xX"; +>>>>>>> bpikaar/master + } } //# sourceMappingURL=main.js.map \ No newline at end of file diff --git a/les3/MT3C/DecoratorTextfield/dist/js/main.js.map b/les3/MT3C/DecoratorTextfield/dist/js/main.js.map index 058f013..c577b08 100644 --- a/les3/MT3C/DecoratorTextfield/dist/js/main.js.map +++ b/les3/MT3C/DecoratorTextfield/dist/js/main.js.map @@ -1 +1,5 @@ -{"version":3,"file":"main.js","sourceRoot":"","sources":["../../dev/main.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE;IAE5B,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,sBAAsB,CAAC;IACnB,CAAC,CAAC,cAAc,EAAE,CAAC;IACnB,IAAI,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAE/C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAI7B,EAAE,CAAA,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAEjD,CAAC;IAED,EAAE,CAAA,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;IAE7D,CAAC;IAED,EAAE,CAAA,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEvD,CAAC;IAED,EAAE,CAAA,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAE5C,CAAC;IAGD,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;AAEnC,CAAC"} \ No newline at end of file +<<<<<<< HEAD +{"version":3,"file":"main.js","sourceRoot":"","sources":["../../dev/textDecorator.ts","../../dev/decorators/capital.ts","../../dev/decorators/lowerCase.ts","../../dev/decorators/reverse.ts","../../dev/decorators/summary.ts","../../dev/main.ts","../../dev/rawString.ts","../../dev/studentDecorators/removeVowels.ts","../../dev/text.ts"],"names":[],"mappings":"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"} +======= +{"version":3,"file":"main.js","sourceRoot":"","sources":["../../dev/textObject.ts","../../dev/capsName.ts","../../dev/extensions.ts","../../dev/leetName.ts","../../dev/main.ts","../../dev/name.ts","../../dev/scrambledName.ts","../../dev/XxxXName.ts"],"names":[],"mappings":"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"} +>>>>>>> bpikaar/master diff --git a/les4/Iterators_lesopdrachten/.vscode/symbols.json b/les4/Iterators_lesopdrachten/.vscode/symbols.json index ac610a1..560bd24 100644 --- a/les4/Iterators_lesopdrachten/.vscode/symbols.json +++ b/les4/Iterators_lesopdrachten/.vscode/symbols.json @@ -1 +1 @@ -{"symbols":{"IGameObject":{"hasNamespace":false,"type":1,"moduleName":"IGameObject","relativePath":"dev/IGameObject"},"Bubble":{"hasNamespace":false,"type":0,"moduleName":"Bubble","relativePath":"dev/Bubble"},"FloatingBehavior":{"hasNamespace":false,"type":0,"moduleName":"FloatingBehavior","relativePath":"dev/behaviors/FloatingBehavior"},"DeadBehavior":{"hasNamespace":false,"type":0,"moduleName":"deadBehavior","relativePath":"dev/behaviors/deadBehavior"},"FishGenerator":{"hasNamespace":false,"type":0,"moduleName":"FishGenerator","relativePath":"dev/FishGenerator"},"Aquarium":{"hasNamespace":false,"type":0,"moduleName":"Aquarium","relativePath":"dev/Aquarium"},"Game":{"hasNamespace":false,"type":0,"moduleName":"Game","relativePath":"dev/Game"},"Bread":{"hasNamespace":false,"type":0,"moduleName":"Bread","relativePath":"dev/Bread"},"SwimBehavior":{"hasNamespace":false,"type":0,"moduleName":"SwimBahavior","relativePath":"dev/behaviors/SwimBahavior"},"Fish":{"hasNamespace":false,"type":0,"moduleName":"Fish","relativePath":"dev/Fish"},"SearchFood":{"hasNamespace":false,"type":0,"moduleName":"SearchFood","relativePath":"dev/behaviors/SearchFood"},"Capital":{"hasNamespace":false,"type":0,"moduleName":"capital","relativePath":"dev/capital"},"RawString":{"hasNamespace":false,"type":0,"moduleName":"rawString","relativePath":"dev/rawString"},"Txt":{"hasNamespace":false,"type":1,"moduleName":"text","relativePath":"dev/text"},"Reverse":{"hasNamespace":false,"type":0,"moduleName":"reverse","relativePath":"dev/reverse"},"LowerCase":{"hasNamespace":false,"type":0,"moduleName":"lowerCase","relativePath":"dev/lowerCase"},"Summary":{"hasNamespace":false,"type":0,"moduleName":"summary","relativePath":"dev/summary"},"TxtDecorator":{"hasNamespace":false,"type":0,"moduleName":"txtDecorator","relativePath":"dev/txtDecorator"},"Table":{"hasNamespace":false,"type":0,"moduleName":"table","relativePath":"dev/table"},"ClubsIterableIterator":{"hasNamespace":false,"type":0,"moduleName":"clubsIterableIterator","relativePath":"../IteratorCode/dev/clubsIterableIterator"},"ClubsIterator":{"hasNamespace":false,"type":0,"moduleName":"clubsIterator","relativePath":"dev/clubsIterator"},"TableView":{"hasNamespace":false,"type":0,"moduleName":"tableView","relativePath":"dev/tableView"},"IteratorInterface":{"hasNamespace":false,"type":1,"moduleName":"1_interface","relativePath":"dev/1_interface"},"SimplesIterator":{"hasNamespace":false,"type":0,"moduleName":"simpleIterator","relativePath":"dev/simpleIterator"},"Generator":{"hasNamespace":false,"type":0,"moduleName":"4_generator","relativePath":"dev/4_generator"},"SimpleIterator":{"hasNamespace":false,"type":0,"moduleName":"1_simpel","relativePath":"dev/1_simpel"},"TypeScriptIterator":{"hasNamespace":false,"type":0,"moduleName":"2_typescriptIterator.1","relativePath":"dev/2_typescriptIterator.1"},"TypeScriptIterableIterator":{"hasNamespace":false,"type":0,"moduleName":"3_typescriptIterableIterator","relativePath":"dev/3_typescriptIterableIterator"}},"files":{"dev/behaviors/deadBehavior.ts":"2017-02-06T21:13:53.000Z","dev/behaviors/FloatingBehavior.ts":"2017-02-06T21:13:35.000Z","dev/bubble.ts":"2017-02-06T21:12:38.000Z","dev/fish.ts":"2017-02-06T21:12:57.000Z","dev/game.ts":"2017-02-06T21:15:48.000Z","dev/main.ts":"2017-03-13T15:34:34.000Z","dev/behaviors/SwimBahavior.ts":"2017-02-06T22:13:18.000Z","dev/aquarium.ts":"2017-02-06T21:12:31.000Z","dev/behaviors/SearchFood.ts":"2017-02-07T08:38:49.000Z","dev/1_interface.ts":"2017-03-12T10:38:47.000Z","dev/1_simpel.ts":"2017-03-13T15:14:50.000Z","dev/3_typescriptIterableIterator.ts":"2017-03-13T15:27:52.000Z","../IteratorCode/dev/clubsIterableIterator.ts":"2017-03-12T11:47:13.000Z","dev/2_typescriptIterator.1.ts":"2017-03-13T15:24:04.000Z"}} \ No newline at end of file +{"symbols":{"IGameObject":{"hasNamespace":false,"type":1,"moduleName":"IGameObject","relativePath":"dev/IGameObject"},"Bubble":{"hasNamespace":false,"type":0,"moduleName":"Bubble","relativePath":"dev/Bubble"},"FloatingBehavior":{"hasNamespace":false,"type":0,"moduleName":"FloatingBehavior","relativePath":"dev/behaviors/FloatingBehavior"},"DeadBehavior":{"hasNamespace":false,"type":0,"moduleName":"deadBehavior","relativePath":"dev/behaviors/deadBehavior"},"FishGenerator":{"hasNamespace":false,"type":0,"moduleName":"FishGenerator","relativePath":"dev/FishGenerator"},"Aquarium":{"hasNamespace":false,"type":0,"moduleName":"Aquarium","relativePath":"dev/Aquarium"},"Game":{"hasNamespace":false,"type":0,"moduleName":"Game","relativePath":"dev/Game"},"Bread":{"hasNamespace":false,"type":0,"moduleName":"Bread","relativePath":"dev/Bread"},"SwimBehavior":{"hasNamespace":false,"type":0,"moduleName":"SwimBahavior","relativePath":"dev/behaviors/SwimBahavior"},"Fish":{"hasNamespace":false,"type":0,"moduleName":"Fish","relativePath":"dev/Fish"},"SearchFood":{"hasNamespace":false,"type":0,"moduleName":"SearchFood","relativePath":"dev/behaviors/SearchFood"},"Capital":{"hasNamespace":false,"type":0,"moduleName":"capital","relativePath":"dev/capital"},"RawString":{"hasNamespace":false,"type":0,"moduleName":"rawString","relativePath":"dev/rawString"},"Txt":{"hasNamespace":false,"type":1,"moduleName":"text","relativePath":"dev/text"},"Reverse":{"hasNamespace":false,"type":0,"moduleName":"reverse","relativePath":"dev/reverse"},"LowerCase":{"hasNamespace":false,"type":0,"moduleName":"lowerCase","relativePath":"dev/lowerCase"},"Summary":{"hasNamespace":false,"type":0,"moduleName":"summary","relativePath":"dev/summary"},"TxtDecorator":{"hasNamespace":false,"type":0,"moduleName":"txtDecorator","relativePath":"dev/txtDecorator"},"Table":{"hasNamespace":false,"type":0,"moduleName":"table","relativePath":"dev/table"},"ClubsIterableIterator":{"hasNamespace":false,"type":0,"moduleName":"clubsIterableIterator","relativePath":"../IteratorCode/dev/clubsIterableIterator"},"ClubsIterator":{"hasNamespace":false,"type":0,"moduleName":"clubsIterator","relativePath":"dev/clubsIterator"},"TableView":{"hasNamespace":false,"type":0,"moduleName":"tableView","relativePath":"dev/tableView"},"IteratorInterface":{"hasNamespace":false,"type":1,"moduleName":"1_interface","relativePath":"dev/1_interface"},"SimplesIterator":{"hasNamespace":false,"type":0,"moduleName":"simpleIterator","relativePath":"dev/simpleIterator"},"Generator":{"hasNamespace":false,"type":0,"moduleName":"4_generator","relativePath":"dev/4_generator"},"TypeScriptIterableIterator":{"hasNamespace":false,"type":0,"moduleName":"3_typescriptIterableIterator","relativePath":"dev/3_typescriptIterableIterator"},"TypeScriptIterator":{"hasNamespace":false,"type":0,"moduleName":"2_typescriptIterator.1","relativePath":"dev/2_typescriptIterator.1"},"SimpleIterator":{"hasNamespace":false,"type":0,"moduleName":"1_simpel","relativePath":"dev/1_simpel"}},"files":{"dev/behaviors/deadBehavior.ts":"2017-02-06T21:13:53.000Z","dev/behaviors/FloatingBehavior.ts":"2017-02-06T21:13:35.000Z","dev/bubble.ts":"2017-02-06T21:12:38.000Z","dev/fish.ts":"2017-02-06T21:12:57.000Z","dev/game.ts":"2017-02-06T21:15:48.000Z","dev/main.ts":"2017-03-14T09:08:56.000Z","dev/behaviors/SwimBahavior.ts":"2017-02-06T22:13:18.000Z","dev/aquarium.ts":"2017-02-06T21:12:31.000Z","dev/behaviors/SearchFood.ts":"2017-02-07T08:38:49.000Z","dev/1_interface.ts":"2017-03-12T10:38:47.000Z","dev/1_simpel.ts":"2017-03-14T09:09:34.000Z","dev/3_typescriptIterableIterator.ts":"2017-03-14T09:09:31.000Z","../IteratorCode/dev/clubsIterableIterator.ts":"2017-03-12T11:47:13.000Z","dev/2_typescriptIterator.1.ts":"2017-03-14T09:09:33.000Z"}} \ No newline at end of file diff --git a/les4/Iterators_lesopdrachten/dev/1_simpel.ts b/les4/Iterators_lesopdrachten/dev/1_simpel.ts index df9f70b..2ff00c8 100644 --- a/les4/Iterators_lesopdrachten/dev/1_simpel.ts +++ b/les4/Iterators_lesopdrachten/dev/1_simpel.ts @@ -8,16 +8,10 @@ class SimpleIterator implements IteratorInterface { } public next(): Object { - if (this.hasNext()){ - return this.collection[this.pointer++]; - } - else { - return null; - } + } public hasNext(): boolean { - return this.collection.length > this.pointer; } } diff --git a/les4/Iterators_lesopdrachten/dev/2_typescriptIterator.1.ts b/les4/Iterators_lesopdrachten/dev/2_typescriptIterator.1.ts index db28064..77efe36 100644 --- a/les4/Iterators_lesopdrachten/dev/2_typescriptIterator.1.ts +++ b/les4/Iterators_lesopdrachten/dev/2_typescriptIterator.1.ts @@ -8,22 +8,10 @@ class TypeScriptIterator implements Iterator { } public next(): IteratorResult { - if (this.hasNext()){ - return { - done: false, - value: this.collection[this.pointer++] - } - } - else { - return { - done: true, - value: null - } - } + } public hasNext(): Boolean { - return this.collection.length > this.pointer; } } diff --git a/les4/Iterators_lesopdrachten/dev/3_typescriptIterableIterator.ts b/les4/Iterators_lesopdrachten/dev/3_typescriptIterableIterator.ts index febec16..1069201 100644 --- a/les4/Iterators_lesopdrachten/dev/3_typescriptIterableIterator.ts +++ b/les4/Iterators_lesopdrachten/dev/3_typescriptIterableIterator.ts @@ -3,27 +3,11 @@ class TypeScriptIterableIterator implements IterableIterator { private collection : number[]; private pointer = 0; - [Symbol.iterator]() : IterableIterator { - return this; - } - constructor(collection: number[]) { this.collection = collection; } public next(): IteratorResult { - if (this.hasNext()){ - return { - done: false, - value: this.collection[this.pointer++] - } - } - else { - return { - done: true, - value: null - } - } } public hasNext(): Boolean { diff --git a/les4/Iterators_lesopdrachten/dev/main.ts b/les4/Iterators_lesopdrachten/dev/main.ts index 84b597a..57a1e3e 100755 --- a/les4/Iterators_lesopdrachten/dev/main.ts +++ b/les4/Iterators_lesopdrachten/dev/main.ts @@ -5,12 +5,6 @@ window.addEventListener("load", function() { let simpleIterator : SimpleIterator = new SimpleIterator([0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]); - while(simpleIterator.hasNext()) { - console.log(simpleIterator.next()); - } - - - // Voorbeeld 2: gebruik van TypeScript Iterator let typeScriptIterator : TypeScriptIterator = new TypeScriptIterator([89, 144, 233, 377, 610, 987, 1597]); @@ -20,9 +14,6 @@ window.addEventListener("load", function() { let typeScriptItrableIterator : TypeScriptIterableIterator = new TypeScriptIterableIterator([2584, 4181, 6765, 10946]); - for (let item of typeScriptItrableIterator) { - console.log(item); - } // Voorbeeld 4: gebruik van generator function* idMaker(){ @@ -38,10 +29,4 @@ window.addEventListener("load", function() { } let gen = idMaker(); - - //console.log(gen.next()); - - for(let item of idMaker()) { - console.log(item); - } }); \ No newline at end of file