diff --git a/logistic.c b/logistic.c
index f4a981a..4d31464 100755
--- a/logistic.c
+++ b/logistic.c
@@ -1,364 +1,17 @@
-//////////////////////////////////////////////////////////////////////////////////
-//				Logistic Map v2.01.c				//
-//				2007.12.16					//
-//		Desenha cada conjunto de pontos para cada r de uma vez,		//
-//		permite redimensionamento da janela, diferentes funçoes,	// 
-//		Inclui eixos a 100%, faz zoom direitinho, falta a numeracao	//
-//		nos eixos. Faz ouput das variaveis na consola			//
-//////////////////////////////////////////////////////////////////////////////////
-#include <GL/glut.h>
-#include <GL/gl.h>
 #include <stdio.h>
 #include <math.h>
-#include <stdlib.h>
+#include "logistic.h"
 
-#define BORDER 20
 
-///////////////////////////////////////////////////////////
-//variaveis globais
-int		n;
-int 		i=0;
-long int 	offset = 50000;
-double		r_min = 2.3;
-double		r_max = 4.0;
-double		x_min = 0.0;
-double		x_max = 1.0;
-int 		num_pontos = 200;
-double 		x0 = 0.5;
-double 		r = 2.3;
-double 		x = 0.5;
-int 		wgl = 1434;
-int 		hgl = 852;
-int 		mouse_presses = 0;
-double		zoom_r;
-double		zoom_x;
-int 		jumps = 800;
-double 		razao_r;
-double		razao_x;
-double		margem_r;
-double		margem_x;
-
-
-void output(GLfloat x, GLfloat y, char *text)
+int main()
 {
-    char *p;
-    
-    glPushMatrix();
-    glTranslatef(x, y, 0);
-    for (p = text; *p; p++)
-        glutStrokeCharacter(GLUT_STROKE_ROMAN, *p);
-    glPopMatrix();
-}
-
-///////////////////////////////////////////////////////////
-//Funcoes Calc
-double calc_0(){	
-	return (r*x*(1-x));
-}
-
-double calc_1(){
-	return (r * sin(x) * (1 - sin(x)));
-}	
-
-double calc_2(){
-	return (r*pow(x,3)*(1-pow(x,3)));
-}
-
-double (*calc[10])() = {calc_0,calc_1,calc_2};
-
-///////////////////////////////////////////////////////////
-//Funcoes set_glbvars (inicializam as variáveis com os melhores valores para cada função calc
-int set_glbvars_0(){
-	i = 0;
-	offset = 100000;
-	r_min = 2.3;
-	r_max = 4.0;
-	x_min = 0.0;
-	x_max = 1.0;
-	num_pontos = 500;
-	x0 = 0.5;
-	r = 2.3;
-	x = 0.5;
-	mouse_presses = 0;
-	jumps = (int) (wgl+100)/(r_max-r_min+2*margem_r);
-
-	razao_r = (r_max-r_min)/(wgl-2*BORDER);
-	razao_x = (x_max-x_min)/(hgl-2*BORDER);
-	margem_r = BORDER*razao_r;
-	margem_x = BORDER*razao_x;
-return 1;
-}
-
-int set_glbvars_1(){
-	i = 0;
-	offset = 50000;
-	r_min = 2.3;
-	r_max = 20.0;
-	x_min = 0.0;
-	x_max = 3.0;
-	num_pontos = 200;
-	x0 = 0.5;
-	r = r_min;
-	x = x0;
-	mouse_presses = 0;
-	jumps = (int) (wgl+100)/(r_max-r_min+2*margem_r);
-
-	razao_r = (r_max-r_min)/(wgl-2*BORDER);
-	razao_x = (x_max-x_min)/(hgl-2*BORDER);
-	margem_r = BORDER*razao_r;
-	margem_x = BORDER*razao_x;
-return 1;
-}
-
-int set_glbvars_2(){
-	i = 0;
-	offset = 50000;
-	r_min = 0;
-	r_max = 20.0;
-	x_min = 0.0;
-	x_max = 20;
-	num_pontos = 200;
-	x0 = 0.5;
-	r = r_min;
-	x = x0;
-	mouse_presses = 0;
-	jumps = (int) (wgl+100)/(r_max-r_min+2*margem_r);
-
-	razao_r = (r_max-r_min)/(wgl-2*BORDER);
-	razao_x = (x_max-x_min)/(hgl-2*BORDER);
-	margem_r = BORDER*razao_r;
-	margem_x = BORDER*razao_x;
-return 1;
-}
-
-int (*set_glbvars[10])() = {set_glbvars_0,set_glbvars_1,set_glbvars_2};
-
-//Funcao que imprime na consola as variaveis usadas para o desenho
-int print_vars(){
-	system("clear");
-	printf("r_min:\t\t%f\n",r_min);
-	printf("r_max:\t\t%f\n",r_max);
-	printf("x_min:\t\t%f\n",x_min);
-	printf("x_max:\t\t%f\n\n",x_max);
-	printf("offset:\t\t%ld\n",offset);
-	printf("num_pontos:\t%d\n\n",num_pontos);
-	printf("wgl:\t\t%d\n",wgl);
-	printf("hgl:\t\t%d\n",hgl);
-return 0;
-}
-
-///////////////////////////////////////////////////////////
-//Funcão que desenha os eixos
-int draw_eixos(){
-	//Cor vermelho
-	glColor3f(1.0f, 0.0f, 0.0f);
-	glBegin(GL_LINES);
+	int i;
+	printf("before itera\n");
+	itera(1000, 0.5);
 
-	//Eixo RR
-	glVertex2f(r_min-margem_r/2,x_min);
-	glVertex2f(r_max+margem_r/3, x_min);
-	//Eixo XX
-	glVertex2f(r_min,x_min-margem_x/2);
-	glVertex2f(r_min,x_max+margem_x/3);
-	glEnd();
-	//Seta RR
-	glBegin(GL_TRIANGLES);
-	glVertex2f(r_max, x_min + margem_x/3);
-	glVertex2f(r_max, x_min -margem_x/3);
-	glVertex2f(r_max+ 2*margem_r/3, x_min);
-	//Seta XX
-	glColor3f(1.0f, .0f, 0.0f);
-        glVertex2f(r_min - margem_r/3,x_max);
-	glVertex2f(r_min + margem_r/3, x_max);
-	glVertex2f(r_min, x_max +2*margem_x/3);
-
-        glEnd();
-	glFlush();
-return 1;
-}
-
- //////////////////////////////////////////////////////////
-// Funcão que desenha os pontos no monitor
-void RenderScene(void){
-	while (i < (offset + num_pontos)){
-		x = calc[n]();
-		glColor3f(1.0f, 1.0f, 1.0f);
-		glBegin(GL_POINTS);
-		if ((r>r_min)&&(r<r_max)&&(x>x_min)&&(x<x_max))
-			glVertex2f(r,x);
-		glEnd();		
-		i++;
-	}
-	// Flush drawing commands and swap
-	glutSwapBuffers();
-}
-
-///////////////////////////////////////////////////////////
-// Called by GLUT library when idle (window not being resized or moved)
-void TimerFunction(int value){
-	i = 0;
-	x = x0;
-	r+= (1.0/jumps);
-	while (i < offset){
-		x = calc[n]();
-		i++;
-	}
-	// Redraw the scene with new coordinates
-	glutPostRedisplay();
-	draw_eixos();
-	glutTimerFunc(1,TimerFunction, 1);
-}
-
- //////////////////////////////////////////////////////////
-// Set up the Rendering state
-void SetupRC(void)
-	{
-	// Set clear color to white
-	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-	glClear(GL_COLOR_BUFFER_BIT);
-	}
-
-///////////////////////////////////////////////////////////
-// Called by GLUT library when the window has chanaged size
-void ChangeSize(GLsizei w, GLsizei h){	
-	wgl = w; hgl = h;
-	set_glbvars[n]();
-	print_vars();
-	glClear(GL_COLOR_BUFFER_BIT);
-	if (h == 0) h = 1;
-	glViewport(0, 0, w, h);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho (r_min-margem_r , r_max + margem_r  , x_min-margem_x, x_max + margem_x, 1.0, -1.0);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-}
-//////////////////////////////////////////////////////////
-//Funcao que realiza o zoom
-int zoom(){
-	x = x0;
-	r = r_min;
-	razao_r = (r_max-r_min)/(wgl-20);
-	razao_x = (x_max-x_min)/(hgl-20);
-	margem_r = BORDER*razao_r;
-	margem_x = BORDER*razao_x;
-	jumps = (int) (wgl+100)/(r_max-r_min+2*margem_r);
-	print_vars();
-	glClear(GL_COLOR_BUFFER_BIT);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho (r_min-margem_r , r_max + margem_r  , x_min-margem_x, x_max + margem_x, 1.0, -1.0);
-	glMatrixMode(GL_MODELVIEW);
-return 1;
-}
-
-int draw_board(double a1,double b1,double a2,double b2){
-	glBegin(GL_LINES);
-	glVertex2d(a1,b1);
-	glVertex2d(a1,b2);
-	glVertex2d(a1,b1);
-	glVertex2d(a2,b1);
-	glVertex2d(a2,b2);
-	glVertex2d(a1,b2);
-	glVertex2d(a2,b2);
-	glVertex2d(a2,b1);
-	glEnd();
-return 1;
-}
-
-//////////////////////////////////////////////////////////
-//Funcao que trata do interface com o rato
-void mouse(int button, int state, int r1, int x1){
-	double r2,x2,r3,x3;
-	double zoom_rtemp,zoom_xtemp;
-	
-	//se o botao direito for pressionado:
-	if (button==GLUT_RIGHT_BUTTON){
-		set_glbvars[n](); 		//reset às variaveis
-		glClear(GL_COLOR_BUFFER_BIT);	//limpar o ecra
-		ChangeSize(wgl,hgl);		//redesenhar
-	}
-	
-	if (button==GLUT_LEFT_BUTTON){
-		if (state == GLUT_DOWN){	//se o botao esquerdo for pressionado:
-			if (mouse_presses==0){	//pela primeira vez
-				zoom_r = ((r_max-r_min+2*margem_r)*r1/wgl)+r_min-margem_r;		
-				zoom_x = ((x_max-x_min+2*margem_x)*(hgl-x1)/hgl)+x_min-margem_x; 
-				mouse_presses = 1;
-				r2 = ((r_max-r_min+2*margem_r)*(r1-1)/wgl)+r_min-margem_r;
-				r3 = ((r_max-r_min+2*margem_r)*(r1+1)/wgl)+r_min-margem_r;
-				x2 = ((x_max-x_min+2*margem_x)*(hgl-(x1-1))/hgl)+x_min-margem_x;
-				x3 = ((x_max-x_min+2*margem_x)*(hgl-(x1+1))/hgl)+x_min-margem_x;
-				glColor3f(0.1f,1.0f,0.1f);
-				glRectf(r2,x2,r3,x3);
-			}
-			else {	//ou pela segunda
-				zoom_rtemp = ((r_max-r_min+2*margem_r)*r1/wgl)+r_min-margem_r;
-				zoom_xtemp = ((x_max-x_min+2*margem_x)*(hgl-x1)/hgl)+x_min-margem_x; 
-				r2 = ((r_max-r_min+2*margem_r)*(r1-1)/wgl)+r_min-margem_r;
-				r3 = ((r_max-r_min+2*margem_r)*(r1+1)/wgl)+r_min-margem_r;
-				x2 = ((x_max-x_min+2*margem_x)*(hgl-(x1-1))/hgl)+x_min-margem_x;
-				x3 = ((x_max-x_min+2*margem_x)*(hgl-(x1+1))/hgl)+x_min-margem_x;
-				glColor3f(0.1f,1.0f,0.1f);
-				glRectf(r2,x2,r3,x3);
-				
-				if (zoom_rtemp<zoom_r){	r_min = zoom_rtemp;
-							r_max = zoom_r;
-				}
-				else {	r_min = zoom_r;
-					r_max = zoom_rtemp;
-				}
-				if (zoom_xtemp<zoom_x){	x_min = zoom_xtemp;
-							x_max = zoom_x;
-				}
-				else {	x_min = zoom_x;
-					x_max = zoom_xtemp;
-				}
-				glColor3f(0.1f,1.0f,0.1f);
-				//glRectf(r_min,x_min,r_max,x_max);
-				draw_board(r_min,x_min,r_max,x_max);
-				mouse_presses = 2;
-			}
-		}
-		else if (mouse_presses==2) {	//se o botao esquerdo for libertado
-			mouse_presses = 0;
-			zoom();
-		}				
-	}
-}
-////////////////////////////////////////////////////////////////////////////////
-//Funcao que verifica os argumentos passados à main()
-int verify_args(int argc, char *argv[]){
-	if (argc!=2){
-		printf("\n./logistic num_funcao\n");
-		return 0;
-	}
-	else {
-		sscanf(argv[1],"%d",&n);
-		if ((n<0)||(n>=10)){
-			return 0;
-			printf("\n./logistic num_funcao\n");
-		}
-		else return 1;
-	}
-
-}
-///////////////////////////////////////////////////////////
-// Main program entry point
-int main(int argc, char* argv[]){
-	if (!(verify_args(argc,argv))) return 0;
-	else {
-		set_glbvars[n]();
-		glutInit(&argc, argv);
-		glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
-		glutInitWindowSize(wgl,hgl);
-		glutCreateWindow("Logistic Map");
-		glutDisplayFunc(RenderScene);
-		glutReshapeFunc(ChangeSize);
-		glutTimerFunc(1, TimerFunction, 1);
-		glutMouseFunc(mouse);
-		SetupRC();	
-		glutMainLoop();
+	for (i=0;i<171;i++){
+		printf("r = %f\t\t", (float) (i/100.0 + 2.3));
+		printf("x = %f\n", xs[i]);
 	}
 return 0;
 }