Skip to content

Error on Quarter#GetMonths #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Error on Quarter#GetMonths #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions TimePeriod/QuarterTimeRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,28 @@ public string EndQuarterOfYearName
get { return Calendar.GetQuarterOfYearName( EndYear, EndQuarter ); }
} // EndQuarterOfYearName

// ----------------------------------------------------------------------
public ITimePeriodCollection GetMonths()
{
TimePeriodCollection months = new TimePeriodCollection();
for ( int i = 0; i < quarterCount; i++ )
{
for ( int month = 0; month < TimeSpec.MonthsPerQuarter; month++ )
{
int year;
YearMonth yearMonth;
TimeTool.AddMonth( startYear, YearBaseMonth, ( i * TimeSpec.MonthsPerQuarter ) + month, out year, out yearMonth );
months.Add( new Month( year, yearMonth, Calendar ) );
}
}
return months;
} // GetMonths

// ----------------------------------------------------------------------
protected override bool IsEqual( object obj )
// ----------------------------------------------------------------------
public ITimePeriodCollection GetMonths()
{
TimePeriodCollection months = new TimePeriodCollection();
YearMonth startMonth = YearBaseMonth;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion for line 98 and 99:

YearMonth startMonth;
TimeTool.AddMonth(startYear, YearBaseMonth, ((int)StartQuarter - 1) * TimeSpec.MonthsPerQuarter, out _, out startMonth);

TimeTool.AddMonth( startYear, startMonth, (((int)StartQuarter) - 1) * TimeSpec.MonthsPerQuarter, out _, out startMonth );

for ( int i = 0; i < quarterCount; i++ )
{
for ( int month = 0; month < TimeSpec.MonthsPerQuarter; month++ )
{
int year;
YearMonth yearMonth;
TimeTool.AddMonth( startYear, startMonth, ( i * TimeSpec.MonthsPerQuarter ) + month, out year, out yearMonth );
months.Add( new Month( year, yearMonth, Calendar ) );
}
}
return months;
} // GetMonths

// ----------------------------------------------------------------------
protected override bool IsEqual( object obj )
{
return base.IsEqual( obj ) && HasSameData( obj as QuarterTimeRange );
} // IsEqual
Expand Down