From 1e6c09a5bb036ca8a2d9a31f816bce5a6ce42cea Mon Sep 17 00:00:00 2001 From: "M.Scholz" Date: Tue, 19 Jun 2012 22:45:52 +0200 Subject: [PATCH] MatrixGenerator: more highlighting, complexity, --- ss2012/AlgoAnim/Teil 5/eingebunden.jar | Bin 8622450 -> 8623032 bytes .../generators/maths/MatrixGenerator.java | 45 +++++++++++++----- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/ss2012/AlgoAnim/Teil 5/eingebunden.jar b/ss2012/AlgoAnim/Teil 5/eingebunden.jar index 47c817fde3a00a6053a2000e4cd7efb89f971ea0..997b078243c2acfcc0bcb467aca86946a1b0399f 100644 GIT binary patch delta 9889 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 diff --git a/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java b/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java index 72e6d09d..e34c43f8 100644 --- a/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java +++ b/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java @@ -35,13 +35,10 @@ import algoanim.animalscript.AnimalScript; /* * TODO: - * - erste Folie die drei Schritte der Funktionsweise animieren - * - Abschlussfolie(n) mit Komplexitätsbetrachtung der Funktion (sollte n^3 sein) - * - Properties für Textfarbe usw. einfügen * - Benutzerinteraktionen einfügen - * - Elemente der Matrizen A und B einfärben, wenn diese miteinander multipliziert werden. - * - Texte nicht als SourceCode-Objekte, sonder als Textobjekte erstellen. - * Somit können die Properties geändert werden. + * + * optional: + * - Texte nicht als SourceCode-Objekte, sonder als Textobjekte erstellen. Somit können die Properties geändert werden. * */ @@ -70,6 +67,12 @@ public class MatrixGenerator implements Generator { */ private SourceCode info = null; + + /** + * The statement text as a SourceCode object (last several slides) + */ + private SourceCode statement = null; + /** * The sourceCode */ @@ -131,7 +134,7 @@ public class MatrixGenerator implements Generator { this.info = lang.newSourceCode(new Coordinates(10, 75), "info", null, TEXT_PROPS); this.info.addCodeLine("Das hier vorgestellte Verfahren eignet sich zur Multiplikation zweier Matrizen.", null, 0, null); this.info.addCodeLine("Zwei Matrizen können genau dann multipliziert werden, wenn die Spaltenanzahl der", null, 0, null); - this.info.addCodeLine("linken Matrix mit der Zeilenanzahl der rechten Matrix übereinstimmen. ", null, 0, null); + this.info.addCodeLine("linken Matrix mit der Zeilenanzahl der rechten Matrix übereinstimmt. ", null, 0, null); this.info.addCodeLine("Das Verfahren lässt sich leicht iterativ implementieren.", null, 0, null); this.info.addCodeLine("Die Funktioneweise ist hierbei wie folgt:", null, 0, null); this.info.addCodeLine("- Betrachte die i-te Zeile der linken Matrix und die i-te Spalte der rechten Matrix.", null, 1, null); @@ -212,7 +215,7 @@ public class MatrixGenerator implements Generator { String[][] data = new String[1][2]; data[0][0] = "Summe = "; - data[0][1] = "0"; + data[0][1] = ""; this.summe = lang.newStringMatrix(new Offset(15, 0, intMatrixB, AnimalScript.DIRECTION_E), data, "stumme", null); this.summe.changeColor(AnimationPropertiesKeys.FILL_PROPERTY, Color.WHITE, null, null); @@ -250,9 +253,10 @@ public class MatrixGenerator implements Generator { lang.nextStep(); sc.unhighlight(1); sc.highlight(2); - + this.summe.put(0, 1, "0", null, null); int[][] result = new int[matrixA.length][matrixB[0].length]; // 1 int summe = 0; // 2 + int summetmp = 0; for(int i=0; iDie Funktioneweise ist hierbei wie folgt:" + "
- Betrachte die i-te Zeile der linken Matrix und die i-te Spalte der rechten Matrix." +