OSDN > Find Software > adventofcodesolutionsbygs > SCM > hg > adventOfCodeM > Commit

adventofcodesolutionsbygs
Fork
adventOfCodeM
Test2

adventOfCodeM: Commit

Revision	47851d97562a60ccaff7e80339d53bf1b1e866d2 (tree)
Time	2022-11-25 14:33:16
Author	SecT <grzegorzstarowicz@gmai...>
Commiter	SecT

Refactoring - made TaskRunner::run() static

diff -r ee352e15406d -r 47851d97562a Cpp/adventOfCode/main.cpp

--- a/Cpp/adventOfCode/main.cpp Wed Nov 23 11:31:55 2022 +0100

+++ b/Cpp/adventOfCode/main.cpp Fri Nov 25 06:33:16 2022 +0100

		@@ -42,36 +42,35 @@
42	42	Task_2020_01 task2020_01_t;
43	43	task2020_01_t.disableExample(0);
44	44	task2020_01_t.disableExample(1);
45		- task_runner.setTaskToRun(&task2020_01_t, 2020, 1);
46		- task_runner.run();
	45	+ task_runner.runTask(&task2020_01_t, 2020, 1);
47	46
48	47	Task_2020_02 task2020_02_t;
49	48	task2020_02_t.disableExample(0);
50	49	task2020_02_t.disableExample(1);
51		- task_runner.setTaskToRun(&task2020_02_t, 2020, 2);
52		- task_runner.run();
	50	+ task_runner.runTask(&task2020_02_t, 2020, 2);
	51	+
53	52
54	53	Task_2020_03 task2020_03_t;
55	54	task2020_03_t.disableExample(0);
56	55	task2020_03_t.disableExample(1);
57		- task_runner.setTaskToRun(&task2020_03_t, 2020, 3);
58		- task_runner.run();
	56	+ task_runner.runTask(&task2020_03_t, 2020, 3);
	57	+
59	58
60	59	Task_2020_04 task2020_04_t;
61	60	task2020_04_t.disableExample(1);
62		- task_runner.setTaskToRun(&task2020_04_t, 2020, 4);
63		- task_runner.run();
	61	+ task_runner.runTask(&task2020_04_t, 2020, 4);
	62	+
64	63
65	64	Task_2020_05 task2020_05_t;
66	65	task2020_05_t.disableExample(0);
67	66	task2020_05_t.disableExample(1);
68		- task_runner.setTaskToRun(&task2020_05_t, 2020, 5);
69		- task_runner.run();
	67	+ task_runner.runTask(&task2020_05_t, 2020, 5);
	68	+
70	69
71	70	Task_2020_06 task2020_06_t;
72	71	//task2020_06_t.disableSubtask(0);
73		- task_runner.setTaskToRun(&task2020_06_t, 2020, 6);
74		- task_runner.run();
	72	+ task_runner.runTask(&task2020_06_t, 2020, 6);
	73	+
75	74
76	75
77	76	cout<<endl;

		@@ -80,29 +79,26 @@
80	79
81	80
82	81	Task_2021_01 task2021_01;
83		- task_runner.setTaskToRun(&task2021_01, 2021, 1);
84		- task_runner.run();
	82	+ task_runner.runTask(&task2021_01, 2021, 1);
	83	+
85	84
86	85	Task_2021_02 task2021_02;
87		- task_runner.setTaskToRun(&task2021_02, 2021, 2);
88		- task_runner.run();
	86	+ task_runner.runTask(&task2021_02, 2021, 2);
	87	+
89	88
90	89	Task_2021_03 task2021_03;
91		- task_runner.setTaskToRun(&task2021_03, 2021, 3);
92		- task_runner.run();
	90	+ task_runner.runTask(&task2021_03, 2021, 3);
	91	+
93	92
94	93	Task_2021_04 task2021_04;
95		- task_runner.setTaskToRun(&task2021_04, 2021, 4);
96		- task_runner.run();
	94	+ task_runner.runTask(&task2021_04, 2021, 4);
	95	+
97	96
98	97	Task_2021_05 task2021_05;
99		- task_runner.setTaskToRun(&task2021_05, 2021, 5);
100		- task_runner.run();
	98	+ task_runner.runTask(&task2021_05, 2021, 5);
101	99
102	100
103	101	cout<<"End"<<endl;
104	102
105		- //std::cin.get();
106		-
107	103	return 0;
108	104	}

diff -r ee352e15406d -r 47851d97562a Cpp/adventOfCode/taskRunner.cpp

--- a/Cpp/adventOfCode/taskRunner.cpp Wed Nov 23 11:31:55 2022 +0100

+++ b/Cpp/adventOfCode/taskRunner.cpp Fri Nov 25 06:33:16 2022 +0100

		@@ -1,6 +1,6 @@
1	1	#include "taskRunner.h"
2	2
3		-bool TaskRunner::run()
	3	+bool TaskRunner::runTask(Task* task, int year, int id)
4	4	{
5	5	std::vector<std::string> inputData;
6	6	string filePath = "input_"+std::to_string(static_cast<long long>(year))+"_Task_"+padTo(std::to_string(static_cast<long long>(id)),2)+".txt";

diff -r ee352e15406d -r 47851d97562a Cpp/adventOfCode/taskRunner.h

--- a/Cpp/adventOfCode/taskRunner.h Wed Nov 23 11:31:55 2022 +0100

+++ b/Cpp/adventOfCode/taskRunner.h Fri Nov 25 06:33:16 2022 +0100

		@@ -32,15 +32,18 @@
32	32	{
33	33	}
34	34
35		- void setTaskToRun(Task* myTask, int currentTaskYear, int currentTaskId)
36		- {
37		- task = myTask;
38		- year = currentTaskYear;
39		- id = currentTaskId;
40		- }
	35	+// void setTaskToRun(Task* myTask, int currentTaskYear, int currentTaskId)
	36	+// {
	37	+// task = myTask;
	38	+// year = currentTaskYear;
	39	+// id = currentTaskId;
	40	+// }
	41	+//
	42	+//
	43	+// bool run();
41	44
	45	+ static bool runTask(Task* myTask, int currentTaskYear, int currentTaskId);
42	46
43		- bool run();
44	47	};
45	48
46	49	#endif // !TASKRUNNER