From 9069273211c8e49ba1406cd6714b0e7f9a2f10c2 Mon Sep 17 00:00:00 2001 From: "M.Scholz" Date: Wed, 20 Jun 2012 10:53:09 +0200 Subject: [PATCH] Abgabeversion des zweiten Generators --- ss2012/AlgoAnim/Teil 5/eingebunden.jar | Bin 8623032 -> 8623691 bytes .../generators/maths/MatrixGenerator.java | 56 +++++++++++------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/ss2012/AlgoAnim/Teil 5/eingebunden.jar b/ss2012/AlgoAnim/Teil 5/eingebunden.jar index 997b078243c2acfcc0bcb467aca86946a1b0399f..89efcaa066e973799a9af24c88bae9c65ba80d1e 100644 GIT binary patch delta 10396 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 z�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 delta 9746 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 HFWLVBJ3&(b diff --git a/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java b/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java index e34c43f8..3e5920e4 100644 --- a/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java +++ b/ss2012/AlgoAnim/Teil 5/matrixGenerator/generators/maths/MatrixGenerator.java @@ -2,14 +2,13 @@ package generators.maths; import generators.framework.Generator; import generators.framework.GeneratorType; -import interactionsupport.models.FillInBlanksQuestionModel; -import interactionsupport.models.QuestionGroupModel; +import interactionsupport.models.MultipleSelectionQuestionModel; import java.awt.Color; import java.util.Locale; -import java.util.Random; import algoanim.primitives.IntMatrix; +import algoanim.primitives.Rect; import algoanim.primitives.SourceCode; import algoanim.primitives.StringMatrix; import algoanim.primitives.generators.Language; @@ -19,30 +18,19 @@ import algoanim.properties.RectProperties; import algoanim.properties.SourceCodeProperties; import algoanim.properties.TextProperties; import algoanim.util.Coordinates; -import algoanim.util.DisplayOptions; import algoanim.util.Offset; import algoanim.util.Timing; import java.util.Hashtable; -import org.apache.commons.collections.functors.FalsePredicate; import de.ahrgr.animal.kohnert.asugen.Font; +import de.ahrgr.animal.kohnert.asugen.Rectangle; import de.ahrgr.animal.kohnert.asugen.Text; import generators.framework.properties.AnimationPropertiesContainer; import algoanim.animalscript.AnimalScript; -/* - * TODO: - * - Benutzerinteraktionen einfügen - * - * optional: - * - Texte nicht als SourceCode-Objekte, sonder als Textobjekte erstellen. Somit können die Properties geändert werden. - * - */ - - public class MatrixGenerator implements Generator { @@ -86,6 +74,12 @@ public class MatrixGenerator implements Generator { private IntMatrix intMatrixB = null; private IntMatrix intMatrixResult = null; + /** + * The lines using rectanlges + */ + private Rect line1 = null; + private Rect line2 = null; + /** * unhighlightingTime */ @@ -220,6 +214,15 @@ public class MatrixGenerator implements Generator { 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); + //generate lines using rectangles + line1 = lang.newRect( new Offset(-4, 0, intMatrixB, AnimalScript.DIRECTION_NW), + new Offset(-4, 0, intMatrixResult, AnimalScript.DIRECTION_SW), + "line1", null); + + line2 = lang.newRect( new Offset(0, -2, intMatrixA, AnimalScript.DIRECTION_NW), + new Offset(0, -2, intMatrixResult, AnimalScript.DIRECTION_NE), + "line2", null); + } /** @@ -231,7 +234,7 @@ public class MatrixGenerator implements Generator { private void falk(){ //STEP - lang.nextStep(); + lang.nextStep("Einleitung"); info.hide(); //generate the source code @@ -241,7 +244,7 @@ public class MatrixGenerator implements Generator { generateMatrices(); //STEP - lang.nextStep(); + lang.nextStep("Der Algorithmus"); sc.highlight(0); //STEP @@ -318,6 +321,8 @@ public class MatrixGenerator implements Generator { intMatrixA.hide(); intMatrixB.hide(); this.summe.hide(); + line1.hide(); + line2.hide(); algoanim.primitives.Text ergebnis = lang.newText(new Offset(-60, 0, intMatrixResult, AnimalScript.DIRECTION_NW), "Ergebnis: ", "name", null); @@ -336,17 +341,28 @@ public class MatrixGenerator implements Generator { */ private void generateStatement(){ + lang.setInteractionType(Language.INTERACTION_TYPE_AVINTERACTION); + statement = lang.newSourceCode(new Coordinates(10, 75), "statement", null, TEXT_PROPS); statement.addCodeLine("Komplexität:", null, 0, null); + + MultipleSelectionQuestionModel msq = new MultipleSelectionQuestionModel("multipleSelectionQuestion"); + msq.setPrompt("Welche Komplexität besitzt die behandelte Methode?"); + msq.addAnswer("O(n^2)", -1, "Nein, es handelt sich um O(n^3)!"); + msq.addAnswer("O(n^3)", 1, "Richtig!"); + msq.addAnswer("Omega(n^3)", -1, "Nein, es handelt sich um O(n^3)!"); + msq.setGroupID("Second question group"); + lang.addMSQuestion(msq); + + //STEP + lang.nextStep("Komplexität"); + statement.addCodeLine("Abschließend wollen wir noch einen kurzen Blick auf die Komplexität des Verfahrens werfen.", null, 0, null); statement.addCodeLine("Die kritischen Elemente des Algorithmus sind die drei verschachtelten Schleifen.", null, 0, null); statement.addCodeLine("Die äußere Schleife läuft über die Anzahl n der Zeilen der Matrix A.", null, 0, null); statement.addCodeLine("Die mittlere Schleife läuft über die Anzahl m der Spalten der Matrix B.", null, 0, null); statement.addCodeLine("Die innere Schleife läuft über die Anzahl p der Spalten von A.", null, 0, null); statement.addCodeLine("Durch Anwendung der Produktregel erhalten wir somit eine kubische Komplexität von O(n^3).", null, 0, null); - //TODO: implement the statement for the last view slides! - - //Zeilenazahl(A) * Spaltenanzahl(B) * Spaltenanzah(A) }