"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/engine/timeconstraint.cpp" between
fet-5.45.0.tar.bz2 and fet-5.45.1.tar.bz2

About: FET allows to automatically schedule a timetable for e.g. of a school, high-school or university.

timeconstraint.cpp  (fet-5.45.0.tar.bz2):timeconstraint.cpp  (fet-5.45.1.tar.bz2)
skipping to change at line 2972 skipping to change at line 2972
if(hour2+duration2+minGap s > hour1) if(hour2+duration2+minGap s > hour1)
tt = (hour2+durat ion2+minGaps) - hour1; tt = (hour2+durat ion2+minGaps) - hour1;
} }
} }
tmp=tt; tmp=tt;
nbroken+=tmp; nbroken+=tmp;
if(tt>0 && conflictsString!=NULL){ if(tt>0 && conflictsString!=NULL){
QString s=tr("Time constraint min gaps between activities broken: activity with id=%1 (%2) conflicts with activit y with id=%3 (%4), they are on the same day %5 and there are %6 extra hours betw een them", QString s=tr("Time constraint min gaps between activities broken: activity with id=%1 (%2) conflicts with activit y with id=%3 (%4), they are on the same day %5 and there are %6 more needed hour s between them",
"%1 is the id, %2 is the detailed description of the activity, %3 id, %4 det. descr.") "%1 is the id, %2 is the detailed description of the activity, %3 id, %4 det. descr.")
.arg(this->activitiesId[i]) .arg(this->activitiesId[i])
.arg(getActivityDetailedDescript ion(r, this->activitiesId[i])) .arg(getActivityDetailedDescript ion(r, this->activitiesId[i]))
.arg(this->activitiesId[j]) .arg(this->activitiesId[j])
.arg(getActivityDetailedDescript ion(r, this->activitiesId[j])) .arg(getActivityDetailedDescript ion(r, this->activitiesId[j]))
.arg(r.daysOfTheWeek[day1]) .arg(r.daysOfTheWeek[day1])
.arg(tt); .arg(tt);
s+=", "; s+=", ";
s+=tr("conflicts factor increase= %1").arg(CustomFETString::numberPlusTwoDigitsPrecision(tmp*weightPercentage/100) ); s+=tr("conflicts factor increase= %1").arg(CustomFETString::numberPlusTwoDigitsPrecision(tmp*weightPercentage/100) );
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)