Skip to content

Commit fa18455

Browse files
#TDP - 2 Add comment
1 parent 9aadb56 commit fa18455

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

ModelingWorkMachineWithBreakdowns/ModelingWorkForm.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,41 @@ System::Void ModelingWorkMachineWithBreakdowns::ModelingWorkForm::Btn_execution_
7373
double const timeTroubleshootinTo = Convert::ToDouble(tb_troubleshootingTo->Text->Replace(".", ","));
7474

7575
double timeBeforeNextTask = getTimeBefoeNextTask(1.0); //âðåìÿ äî ñëåäóþùåãî çàäàíèÿ
76-
double timeToBreakdownMachine = getTimeBeforeBreakdownMachine(timeBreakDown_M_X, timeBreakdown_StandartDeviation); // âðåìÿ äî ïîëîìêè
76+
double timeBeforeBreakdownMachine = getTimeBeforeBreakdownMachine(timeBreakDown_M_X, timeBreakdown_StandartDeviation); // âðåìÿ äî ïîëîìêè
7777

7878
double totalTimeWorkMachine = 0;
79-
int brokenDetails = 0;
79+
int countBrokenDetails = 0;
8080
double totalTimeRepair = 0;
8181
while (countDetails > 0)
8282
{
8383
if (timeBeforeNextTask > 0)
8484
{
85-
totalTimeWorkMachine += timeBeforeNextTask;
85+
totalTimeWorkMachine += timeBeforeNextTask; //äîáàâëÿåì âðåìÿ îæèäàíèÿ çàäàíèÿ
8686
timeBeforeNextTask = 0;
8787
}
8888

8989
double setMachine = getDebugMachine(timeExectuionInterval1, timeExectuionInterval2);
9090
double timeExectuionTask = getTimeExecutionTask(timeExectuionM_X, timeExectuionStandartDeviation);
9191
double timeDebugExection_oneTask = setMachine + timeExectuionTask;
9292

93-
if (timeDebugExection_oneTask < timeToBreakdownMachine)
93+
if (timeDebugExection_oneTask < timeBeforeBreakdownMachine)
9494
{
9595
timeBeforeNextTask += getTimeBefoeNextTask(1.0);
96-
totalTimeWorkMachine += timeDebugExection_oneTask;
97-
timeToBreakdownMachine -= timeDebugExection_oneTask;
96+
totalTimeWorkMachine += timeDebugExection_oneTask; //ê îáùåìó âðåìåíè ðàáîòû ñòàíêà äîáàâëÿåì âðåìÿ âûïîëíåíèÿ îäíîãî çàäàíèÿ
97+
timeBeforeBreakdownMachine -= timeDebugExection_oneTask; //îò âðåìåíè äî ïîëîìêè îòíèìàåì âûïîëíåíèå îäíîãî çàäàíèÿ
98+
timeBeforeNextTask -= timeDebugExection_oneTask; //îò âðåìåíè äî ñëåä. çàäàíèÿ îòíèìàåì âðåìÿ âûï. îäíîãî çàäàíèÿ
9899
countDetails--;
99100
}
100101
else
101102
{
102-
brokenDetails++;
103-
totalTimeWorkMachine += timeToBreakdownMachine;
104-
timeBeforeNextTask -= timeToBreakdownMachine;
103+
countBrokenDetails++;
104+
totalTimeWorkMachine += timeBeforeBreakdownMachine; //îáùåå âðåìÿ ðàáîòû ñòàíêà + âðåìÿ ïðîñòîÿ
105+
timeBeforeNextTask -= timeBeforeBreakdownMachine;
105106
double repairTime = getTimeRepair(timeTroubleshootinFrom, timeTroubleshootinTo);
106107
//cout repairTime
107108
totalTimeWorkMachine += repairTime;
108109
timeBeforeNextTask -= repairTime;
109-
timeToBreakdownMachine = getTimeBeforeBreakdownMachine(timeBreakDown_M_X, timeBreakdown_StandartDeviation);
110+
timeBeforeBreakdownMachine = getTimeBeforeBreakdownMachine(timeBreakDown_M_X, timeBreakdown_StandartDeviation);
110111
totalTimeRepair += repairTime;
111112

112113
}
@@ -119,7 +120,7 @@ System::Void ModelingWorkMachineWithBreakdowns::ModelingWorkForm::Btn_execution_
119120
}
120121

121122
lbl_countTask->Text = "Êîëè÷åñòâî äåòàëåé: " + allDetails.ToString();
122-
lbl_CountBreakdown->Text = "Êîëè÷åñòâî ïîëîìîê: " + brokenDetails.ToString();
123+
lbl_CountBreakdown->Text = "Êîëè÷åñòâî ïîëîìîê: " + countBrokenDetails.ToString();
123124
lbl_TimeWork->Text = "Âðåìÿ ðàáîòû: " + (static_cast<int>(totalTimeWorkMachine)).ToString() +" ÷. " + (static_cast<int>((int)totalTimeWorkMachine % 1 * 60)).ToString() +" ìèí.";
124125
lbl_DetailInQueue->Text = "Äåòàëåé â î÷åðåäè: " + countDetailInQueue.ToString();
125126
lbl_TotalTimeRepair->Text = "Îáùåå âðåìÿ ðåìîíòà: " + (static_cast<int>(totalTimeRepair)).ToString() + " ÷. " + (static_cast<int>((int)totalTimeRepair % 1 * 60)).ToString() + " ìèí.";

0 commit comments

Comments
 (0)