ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/utils/ProgressBar.cpp

Comparing:
trunk/src/utils/ProgressBar.cpp (file contents), Revision 1420 by gezelter, Fri Mar 26 18:42:55 2010 UTC vs.
branches/development/src/utils/ProgressBar.cpp (file contents), Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

#	Line 36 | Line 36
36		* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38		* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	<	* [4]  Vardeman, Stocker & Gezelter, in progress (2010).
39	>	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	>	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43	<	#include <string>
44	<	#include <sstream>
43	>	#include <iostream>
44	>	#include <cstdlib>
45	>
46	>	#ifdef _MSC_VER
47	>	#include <Windows.h>
48	>	#include <stdio.h>
49	>	#include <io.h>
50	>	#define isatty _isatty
51	>	#define fileno _fileno
52	>	#else
53	>	#include <cstdio>
54		#include <sys/ioctl.h>
55	+	#include <unistd.h>
56	+	#endif
57	+
58		#ifdef IS_MPI
59		#include <mpi.h>
60	<	#endif //is_mpi
60	>	#endif
61	>
62		#include "utils/ProgressBar.hpp"
63
64	+	using namespace std;
65	+
66		namespace OpenMD {
67
68		const char * progressSpinner_ = "|/-\\";
#	Line 58 | Line 74 | namespace OpenMD {
74		#ifdef IS_MPI
75		if (MPI::COMM_WORLD.Get_rank() == 0) {
76		#endif
77	<	printf("\n");
78	<	fflush(stdout);
77	>	cout << endl;
78	>	cout.flush();
79		#ifdef IS_MPI
80		}
81		#endif
#	Line 70 | Line 86 | namespace OpenMD {
86		}
87
88		void ProgressBar::update() {
89	<	int width = 80;
89	>
90	>	int width;
91	>
92		#ifdef IS_MPI
93		if (MPI::COMM_WORLD.Get_rank() == 0) {
94		#endif
95	<	#ifndef IS_MPI
96	<	// get the window width:
97	<	struct winsize w;
98	<	ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
81	<	width = w.ws_col;
82	<	#endif
95	>
96	>	// only do the progress bar if we are actually running in a tty:
97	>	if (isatty(fileno(stdout))  && (getenv("SGE_TASK_ID")==NULL)) {
98	>	// get the window width:
99
100	<	// We'll use:
101	<	// 31 characters for the completion estimate,
102	<	//  6 for the % complete,
103	<	//  2 characters for the open and closing brackets.
100	>	#ifdef _MSC_VER
101	>	CONSOLE_SCREEN_BUFFER_INFO csbi;
102	>	HANDLE hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
103	>	int ret = GetConsoleScreenBufferInfo(hConsole, &csbi);
104	>	if(ret) {
105	>	width = csbi.dwSize.X - 1;
106	>	}
107	>	#else
108	>	struct winsize w;
109	>	ioctl(fileno(stdout), TIOCGWINSZ, &w);
110	>	width = w.ws_col;
111	>	#endif
112
113	<	int avail = width - 31 - 6 - 2;
113	>	// handle the case when the width is returned as a nonsensical value.
114	>	if (width <= 0) width = 80;
115
116	<	++iteration_;
117	<
118	<	if (maximum_ > 0.0) {
119	<	// we know the maximum, so
120	<	// draw a progress bar
121	<
97	<	RealType percent = value_ * 100.0 / maximum_;
98	<	int hashes = int(percent * avail / 100.0);
99	<	std::string progressbar;
100	<	progressbar.assign(hashes, '#');
116	>	// We'll use:
117	>	// 31 characters for the completion estimate,
118	>	//  6 for the % complete,
119	>	//  2 characters for the open and closing brackets.
120	>
121	>	int avail = width - 31 - 6 - 2;
122
123	<	// add the spinner to the end of the progress bar:
103	<	progressbar += progressSpinner_[iteration_ & 3];
123	>	++iteration_;
124
125	<	// compute the best estimate of the ending time:
106	<	time_t current_ = time(NULL);
107	<	time_t end_ = start_ + (current_ - start_) * (100.0/percent);
108	<	struct tm * ender = localtime(&end_);
109	<	char buffer[24];
110	<	strftime(buffer, 24, "%a %b %d @ %I:%M %p", ender);
125	>	if (maximum_ > 0.0) {
126
127	<	std::stringstream fmt;
128	<	fmt << "\r%3d%% [%-" << avail << "s] Estimate: %s";
129	<	std::string st = fmt.str();
127	>	// we know the maximum, so draw a progress bar
128	>
129	>	RealType percent = value_ * 100.0 / maximum_;
130	>	int hashes = int(percent * avail / 100.0);
131	>
132	>	// compute the best estimate of the ending time:
133	>	time_t current_ = time(NULL);
134	>	time_t end_ = start_ + (current_ - start_) * (100.0/percent);
135	>	struct tm * ender = localtime(&end_);
136	>	char buffer[22];
137	>	strftime(buffer, 22, "%a %b %d @ %I:%M %p", ender);
138
139	<	printf(st.c_str(), int(percent),
140	<	progressbar.c_str(),
141	<	buffer);
142	<
143	<	} else {
144	<	// we don't know the maximum, so we can't draw a progress bar
145	<	int center = (iteration_ % 48) + 1; // 50 spaces, minus 2
146	<	std::string before;
147	<	std::string after;
148	<	before.assign(std::max(center - 2, 0), ' ');
149	<	after.assign(std::min(center + 2, 50), ' ');
150	<
151	<	printf("\r[%s###%s]            ",
152	<	before.c_str(), after.c_str());
153	<	}
154	<	fflush(stdout);
139	>	#ifdef _MSC_VER
140	>	csbi.dwCursorPosition.X = 0;
141	>	SetConsoleCursorPosition(hConsole, csbi.dwCursorPosition);
142	>	#else
143	>	cout << '\r';
144	>	#endif
145	>	cout.width(3);
146	>	cout << right << int(percent);
147	>	cout.width(3);
148	>	cout << "% [";
149	>	cout.fill('#');
150	>	if (hashes+1 < avail) {
151	>	cout.width(hashes+1);
152	>	cout << progressSpinner_[iteration_ & 3];
153	>	} else {
154	>	cout.width(avail);
155	>	cout << '#';
156	>	}
157	>	cout.fill(' ');
158	>	if (avail - hashes - 1  > 0) {
159	>	cout.width(avail - hashes - 1);
160	>	cout << ' ';
161	>	}
162	>	cout.width(11);
163	>	cout << "] Estimate:";
164	>	cout.width(22);
165	>	cout << buffer;
166	>
167	>	}
168	>	cout.flush();
169	>	}
170		#ifdef IS_MPI
171		}
172		#endif

Comparing:
trunk/src/utils/ProgressBar.cpp (property svn:keywords), Revision 1420 by gezelter, Fri Mar 26 18:42:55 2010 UTC vs.
branches/development/src/utils/ProgressBar.cpp (property svn:keywords), Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines