Iniciado suporte ao box plot. ainda nao finalizado

Author: joepreludian

src/main.cc

@@ -10,6 +10,7 @@ int main()
 
 	Matrix matrix_x = Matrix(200,1);
 	Matrix matrix_y = Matrix(200,1);
+
 	//Inicialização teste;
 	for (int i=1; i <= 200; i++)
 	{
@@ -21,29 +22,39 @@ int main()
 
 		matrix_y.add(i, 1, sin(2*xCoord) + cos(xCoord));
 		matrix_y.add(i, 2, cos(2*xCoord) + sin(xCoord)); //Segundo plotter em Y. Alterando dados
-		matrix_y.add(i, 3, 1);
+		matrix_y.add(i, 3, xCoord*0.05);
 	}
 
 	//Instanciando plotter
+
 	//MatrixPlot matrixplot = MatrixPlot(2, 2); //Define subplot Cols; subplot Rows;
+	MatrixPlot matrixplot1 = MatrixPlot();
+	matrixplot1.setAutoRange(false);
 
-	MatrixPlot matrixplot = MatrixPlot();
-	matrixplot.setAutoRange(false);
+	matrixplot1.SetRange('x', -10, 10);
+	matrixplot1.SetRange('y', -2, 2);
 
-	matrixplot.SetRange('x', -10, 10);
-	matrixplot.SetRange('y', -2, 6);
+	matrixplot1.plot1d(matrix_x, matrix_y);
+	matrixplot1.saveToFile("teste.eps");
 
-	matrixplot.plot1d(matrix_x, matrix_y);
-	cout << "Depois do plot" << endl;
+	matrixplot1.Run();
 
-	matrixplot.saveToFile("teste.eps");
 
-	matrixplot.Run();
+	//Exemplo usando matrix plot
 
-	return 0;
-}
+	//Inicializacao do boxplot - Ainda em implementacao
+	/*
+	Matrix matrixbox = Matrix(2,4);
+	for (int i=1; i <= matrixbox.getRows(); i++)
+		for (int j=1; j <= matrixbox.getCols(); j++)
+			matrixbox.add(i,j, j*8);
+
+	MatrixPlot matrixplot = MatrixPlot();
+	matrixplot.plotbox(matrixbox);
 
-void testSimulation()
-{
 
+	matrixplot.Run();
+	*/
+
+	return 0;
 }

src/matrix-plot.cc

@@ -18,7 +18,6 @@
  */
 
 #include "matrix-plot.h"
-#include "MatrixPlotWindow.h"
 
 MatrixPlot::MatrixPlot(int subplotCols, int subplotRows)
 {
@@ -176,15 +175,6 @@ void MatrixPlot::plot1d(Matrix & xMatrix, Matrix & yMatrix){
 
 		this->SetOrigin(0,0,0);
 
-		//Subplotagem
-
-		/*this->SubPlot(
-				this->subplotCols,
-				this->subplotRows,
-				0, "");
-
-		this->Axis("xy");*/
-
 		string color = "";
 		switch (subplotIndex)
 		{
@@ -197,6 +187,9 @@ void MatrixPlot::plot1d(Matrix & xMatrix, Matrix & yMatrix){
 		case 2:
 			color = "b";
 			break;
+		case 3:
+			color = "w";
+			break;
 		}
 
 		if (this->autoRange && subplotIndex == (subplotAmount-1))
@@ -216,88 +209,27 @@ void MatrixPlot::plot1d(Matrix & xMatrix, Matrix & yMatrix){
 
 void MatrixPlot::plotbox(Matrix & referenceMatrix, int subplotIndex)
 {
-	int matrixRows = referenceMatrix.getRows();
-		int matrixCols = referenceMatrix.getCols();
-
-		mglData matrix_X_coordinates(matrixRows);
-		mglData matrix_Y_coordinates(matrixRows);
-
-		range matrixRange;
-
-		float matrixData[matrixRows][matrixCols];
-
-		for (int i=0; i < matrixRows; i++)
-		{
+	int matrixPlotRows = referenceMatrix.getRows();
+	int subplotAmount = referenceMatrix.getCols();
 
-			for (int j=0; j < matrixCols; j++)
-			{
-				float dataPoint = referenceMatrix.getMat(i+1,j+1);
-
-				if (j == 0)
-				{
-
-					//Min_x
-					try {
-						if (dataPoint < matrixRange.x_min)
-							matrixRange.x_min = dataPoint;
-					} catch (...) {
-						matrixRange.x_min = dataPoint;
-					}
-
-					//Max_x
-					try {
-						if (dataPoint > matrixRange.x_max)
-							matrixRange.x_max = dataPoint;
-					} catch (...) {
-						matrixRange.x_max = dataPoint;
-					}
-
-
-					matrix_X_coordinates.a[i] = dataPoint;
-				}
-				else
-				{
-					//Min_x
-					try {
-						if (dataPoint < matrixRange.y_min)
-							matrixRange.y_min = dataPoint;
-					} catch (...) {
-						matrixRange.y_min = dataPoint;
-					}
+	mglData dataBox(subplotAmount);
 
-					//Max_x
-					try {
-						if (dataPoint > matrixRange.y_max)
-							matrixRange.y_max = dataPoint;
-					} catch (...) {
-						matrixRange.y_max = dataPoint;
-					}
-
-					matrix_Y_coordinates.a[i] = dataPoint;
-				}
-
-			}
-
-		}
-
-		this->SetOrigin(0,0,0);
-
-		//Subplotagem
-
-		this->SubPlot(
-				this->subplotCols,
-				this->subplotRows,
-				subplotIndex, "");
+	range matrixRange;
 
-		this->Axis("xy");
+	for (int subplotIndex=0; subplotIndex < subplotAmount; subplotIndex++)
+	{
+		mglData dataItem(matrixPlotRows);
 
-		if (this->autoRange)
+		for (int matrixPlotRowIndex=0; matrixPlotRowIndex < matrixPlotRows; matrixPlotRowIndex++)
 		{
-			this->SetRange('x', matrixRange.x_min, matrixRange.x_max);
-			this->SetRange('y', matrixRange.y_min, matrixRange.y_max);
+			float x = referenceMatrix.getMat((matrixPlotRowIndex+1), (subplotIndex+1));
+			dataItem.a[matrixPlotRowIndex] = x;
+			//dataBox.Set(&x, (long int)matrixPlotRowIndex, (long int)subplotIndex);
 		}
+	}
 
-		this->Plot(matrix_X_coordinates, matrix_Y_coordinates);
+	this->Box();
+	this->BoxPlot(dataBox);
 
 }