cleaned up code
This commit is contained in:
Joshua Moerman
parent
ffa47f36cd
commit
68ab1640a3
1 changed files with 63 additions and 63 deletions
126
main.cpp
126
main.cpp
|
|
@ -15,94 +15,94 @@ int verbose;
|
|||
|
||||
void showHelpText(){
|
||||
std::cout << "Awesome Attractor, version " << __DATE__ << std::endl;
|
||||
std::cout << "Usage: AwesomeAttractor [OPTION]... FILE" << std::endl << std::endl;
|
||||
std::cout << "Usage: AwesomeAttractor [OPTION]... FILE" << std::endl << std::endl;
|
||||
std::cout << "Optons:" << std::endl;
|
||||
std::cout << " --help Shows this help" << std::endl;
|
||||
std::cout << " -q quiet mode" << std::endl;
|
||||
std::cout << " -v verbose mode" << std::endl;
|
||||
std::cout << " -V loud mode" << std::endl;
|
||||
std::cout << " -w N Sets width of output image to N" << std::endl;
|
||||
std::cout << " -h N Sets height of output image to N" << std::endl;
|
||||
std::cout << " -i N Sets number of iterations to N" << std::endl;
|
||||
std::cout << " --help Shows this help" << std::endl;
|
||||
std::cout << " -q quiet mode" << std::endl;
|
||||
std::cout << " -v verbose mode" << std::endl;
|
||||
std::cout << " -V loud mode" << std::endl;
|
||||
std::cout << " -w N Sets width of output image to N" << std::endl;
|
||||
std::cout << " -h N Sets height of output image to N" << std::endl;
|
||||
std::cout << " -i N Sets number of iterations to N" << std::endl;
|
||||
exit(0);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
verbose = 0;
|
||||
std::string attractorFile = DEFAULT_ATTRACTOR_FILE;
|
||||
unsigned int iterations = DEFAULT_ITERATIONS;
|
||||
unsigned int width = DEFAULT_WIDTH;
|
||||
unsigned int height = DEFAULT_HEIGHT;
|
||||
verbose = 0;
|
||||
std::string attractorFile = DEFAULT_ATTRACTOR_FILE;
|
||||
unsigned int iterations = DEFAULT_ITERATIONS;
|
||||
unsigned int width = DEFAULT_WIDTH;
|
||||
unsigned int height = DEFAULT_HEIGHT;
|
||||
|
||||
if ( argc <= 1 ) {
|
||||
showHelpText();
|
||||
}
|
||||
if ( argc <= 1 ) {
|
||||
showHelpText();
|
||||
}
|
||||
|
||||
for ( int i = 1; i < argc; ++i ) {
|
||||
if ( strcmp(argv[i], "-v") == 0 ) {
|
||||
verbose = 1;
|
||||
} else if ( strcmp(argv[i], "-q") == 0 ) {
|
||||
verbose = -1;
|
||||
for ( int i = 1; i < argc; ++i ) {
|
||||
if ( strcmp(argv[i], "-v") == 0 ) {
|
||||
verbose = 1;
|
||||
} else if ( strcmp(argv[i], "-q") == 0 ) {
|
||||
verbose = -1;
|
||||
} else if ( strcmp(argv[i], "--help") == 0 ) {
|
||||
showHelpText();
|
||||
showHelpText();
|
||||
} else if ( strcmp(argv[i], "-V") == 0 ) {
|
||||
verbose = 3;
|
||||
verbose = 3;
|
||||
} else if ( strcmp(argv[i], "-w") == 0 ) {
|
||||
width = atoi(argv[++i]);
|
||||
} else if ( strcmp(argv[i], "-h") == 0 ) {
|
||||
height = atoi(argv[++i]);
|
||||
} else if ( strcmp(argv[i], "-i") == 0 ) {
|
||||
iterations = atoi(argv[++i]);
|
||||
} else {
|
||||
attractorFile = argv[i];
|
||||
}
|
||||
}
|
||||
width = atoi(argv[++i]);
|
||||
} else if ( strcmp(argv[i], "-h") == 0 ) {
|
||||
height = atoi(argv[++i]);
|
||||
} else if ( strcmp(argv[i], "-i") == 0 ) {
|
||||
iterations = atoi(argv[++i]);
|
||||
} else {
|
||||
attractorFile = argv[i];
|
||||
}
|
||||
}
|
||||
|
||||
LogInfo("Awesome Attractor, version %s\n", __DATE__);
|
||||
|
||||
// initialising stuff
|
||||
Attractor myAttractor(attractorFile);
|
||||
// initialising stuff
|
||||
Attractor myAttractor(attractorFile);
|
||||
|
||||
Projector projection;
|
||||
Canvas canvas(width, height, 3);
|
||||
projection.canvas = &canvas;
|
||||
Projector projection;
|
||||
Canvas canvas(width, height, 3);
|
||||
projection.canvas = &canvas;
|
||||
|
||||
myAttractor.projectors.push_back(&projection);
|
||||
myAttractor.init_range();
|
||||
myAttractor.projectors.push_back(&projection);
|
||||
myAttractor.init_range();
|
||||
|
||||
projection.output();
|
||||
projection.output();
|
||||
|
||||
LogInfo("\nRendering\n");
|
||||
LogInfo("\nRendering\n");
|
||||
|
||||
clock_t start, end;
|
||||
start = clock();
|
||||
for ( unsigned int j = 1; j <= 100; ++j ) {
|
||||
for ( unsigned int i = 0; i <= iterations; i++ ) {
|
||||
myAttractor.iterate();
|
||||
myAttractor.plot();
|
||||
}
|
||||
if ( verbose >= 0 ) {
|
||||
clock_t start, end;
|
||||
start = clock();
|
||||
for ( unsigned int j = 1; j <= 100; ++j ) {
|
||||
for ( unsigned int i = 0; i <= iterations; i++ ) {
|
||||
myAttractor.iterate();
|
||||
myAttractor.plot();
|
||||
}
|
||||
if ( verbose >= 0 ) {
|
||||
std::cout << "\r" << j << "% done" << std::flush;
|
||||
}
|
||||
}
|
||||
end = clock();
|
||||
}
|
||||
}
|
||||
end = clock();
|
||||
|
||||
double totalIterations = 100.0*iterations;
|
||||
double totalTime = ((double)(end-start)/(double)(CLOCKS_PER_SEC));
|
||||
LogInfo("\nTotal clock time: %f\n", totalTime);
|
||||
LogMoreInfo("Average iterations per second: %f\n\n", totalIterations/totalTime);
|
||||
double totalIterations = 100.0*iterations;
|
||||
double totalTime = ((double)(end-start)/(double)(CLOCKS_PER_SEC));
|
||||
LogInfo("\nTotal clock time: %f\n", totalTime);
|
||||
LogMoreInfo("Average iterations per second: %f\n\n", totalIterations/totalTime);
|
||||
|
||||
// saving output
|
||||
start = clock();
|
||||
canvas.output_file();
|
||||
end = clock();
|
||||
// saving output
|
||||
start = clock();
|
||||
canvas.output_file();
|
||||
end = clock();
|
||||
|
||||
totalTime = ((double)(end-start)/(double)(CLOCKS_PER_SEC));
|
||||
totalTime = ((double)(end-start)/(double)(CLOCKS_PER_SEC));
|
||||
|
||||
LogInfo("Total clock time for writing png: %f\n", totalTime);
|
||||
LogInfo("Total clock time for writing png: %f\n", totalTime);
|
||||
|
||||
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Reference in a new issue