Commit: 47 - CTraining (svn)

練習用です。いろんなものがごちゃまぜです。

Commit MetaInfo

• Revision: 47 (tree)
• Time: 2015-10-01 12:19:07
• Author: bellyoshi

Log Message

(empty log message)

Change Summary

• modified: TeachYourSelf/stopwatch.obj
• modified: TeachYourSelf/stopwatch.BAK
• modified: TeachYourSelf/stopwatch.exe
• modified: TeachYourSelf/stopwatch.cpp

Incremental Difference

--- TeachYourSelf/stopwatch.cpp	(revision 46)
+++ TeachYourSelf/stopwatch.cpp	(revision 47)
@@ -4,41 +4,43 @@
 
 class stopwatch {
 	clock_t startTime;
-	int timespan;
-	bool switch_on;
+	clock_t endTime;
 public:
 	stopwatch();
+	stopwatch(clock_t starttime);
 	void stop();
 	void start();
+	void show();
 	~stopwatch();
 };
 
 stopwatch::stopwatch()
 {
-	timespan = 0;
-	switch_on = false;
+	startTime = endTime = 0;
 }
-
+stopwatch::stopwatch(clock_t starttime)
+{
+	this->startTime = starttime;
+	this->endTime = 0;
+}
+	
 void stopwatch::start()
 {
-	startTime = clock();
-	switch_on = true;
+	this->startTime = clock();
 }
 
 void stopwatch::stop()
 {
-	if (!switch_on){
-		return;
-	}
-	switch_on = false;
-	clock_t endTime = clock();
-	timespan += (endTime - startTime) / CLOCKS_PER_SEC;
+	this->endTime = clock();
 }
+void stopwatch::show()
+{
+	int timespan = (endTime - startTime) / CLOCKS_PER_SEC;
+	cout << "経過時間: " << timespan << "\n";
+}
 
 stopwatch::~stopwatch()
 {
-	stop();
-	cout << "経過時間: " << timespan << "\n";
 }
 
 int main()
@@ -48,15 +50,16 @@
 	
 	//遅延...
 	sw.start();
-	cout << "on なにか入力: ";
+	cout << "なにか入力: ";
 	cin >> c;
 	sw.stop();
-	cout << "off なにか入力。: ";
+	sw.show();
+	
+	stopwatch sw2(clock());
+	cout << "なにか入力。: ";
 	cin >> c;
-	sw.start();
-	cout << "on なにか入力。: ";
-	cin >> c;
-	sw.stop();
+	sw2.stop();
+	sw2.show();
 	
 	return 0;
 }
\ No newline at end of file