Skip to content

Fdmsstar private sector#36

Open
e wants to merge 5 commits intostagingfrom
FDMSSTAR__private_sector
Open

Fdmsstar private sector#36
e wants to merge 5 commits intostagingfrom
FDMSSTAR__private_sector

Conversation

@e
Copy link
Member

@e e commented Dec 19, 2018

No description provided.

Copy link
Member Author

@e e left a comment

Choose a reason for hiding this comment

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

It's good, we only need to fix one calculation and finish the last one. Also, remember to remove all breakpoints. I think it's OK to have a comment with the name of the variable before each calculation, it's not needed but improves readability. However I would leave just one blank line before an none after, like this:

new_input_df = pd.concat([new_input_df, result_1, result_3], sort=True)

# UBCA.1.0.0.0
addends = {'UBCA.1.0.0.0': ['UXGS.1.0.0.0', '-UMGS.1.0.0.0', 'UBYA.1.0.0.0']}

But it's just a matter of taste really

class ExternalSector(SumAndSpliceMixin):
def perform_computation(self, result_1, result_3, ameco_h_df):
# TODO: Check the scales of the output variables
splicer = Splicer()
Copy link
Member Author

Choose a reason for hiding this comment

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

These two lines are not required?

# STEP 15
class PrivateSector(SumAndSpliceMixin):
def perform_computation(self, result_1, result_12, result_13, result_14, ameco_h_df):
breakpoint()
Copy link
Member Author

Choose a reason for hiding this comment

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

Remember to delete all breakpoints

step_16 = ExternalSector(scales=self.scales)
result_16 = step_16.perform_computation(self.result_1, result_3, self.ameco_df)

breakpoint()
Copy link
Member Author

Choose a reason for hiding this comment

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

Another breakpoint

res_wrong, exp_wrong = res.loc[wrong_names].copy(), exp.loc[wrong_names].copy()
report_diff(res_wrong, exp_wrong)

#breakpoint() No newline at end of file
Copy link
Member Author

Choose a reason for hiding this comment

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

We don't need this comment?

self.result = self.result.append(series, ignore_index=True, sort=True)

# DBGE.1.0.0.0

Copy link
Member Author

Choose a reason for hiding this comment

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

Fix this calculation, it doesn't match the original one

series = series.append(dbge_data)
self.result = self.result.append(series, ignore_index=True, sort=True)

# TODO: DBGI.1.0.0.0
Copy link
Member Author

Choose a reason for hiding this comment

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

Finish the module, perform the last calculation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants