search

aremazeilles / beat_routine

Performance Indicators developed by BEAT consortium for the Eurobench project
0 stars 2 forks source link

Correct csv file and add fillgaps function #39

Closed juritaborri closed 3 years ago

juritaborri commented 3 years ago

@aremazeilles can you help me with these conflicts?

aremazeilles commented 3 years ago

I´ll have a look at it tomorrow afternoon if that is ok.

aremazeilles commented 3 years ago

If you look at here: https://github.com/aremazeilles/beat_routine/commits/Update_csv_and_function It seems your last update is based on a branch which last commit is about the 4 of August.

If you look at the master branch instead, https://github.com/aremazeilles/beat_routine/commits/master, we see that some significant activity has occured since the 4 of August.

As already said, I already fixed the csv issue in the master branch. Appart from the scientific notation, did you have anything more to change to the csv files? If not I would rather try to branch from the current master, and insert in that branch only the changes you made on using the fillgaps function?

The operation you are asking otherwise is a bit cumbersome. I'll try to do what I suggest, and then tell you the outcomes of it.

aremazeilles commented 3 years ago

Check #40 If the CI process succeeds, I would merge the other, and discard this PR.

aremazeilles commented 3 years ago

I would suggest Closing this pull Request WITHOUT merging, and merge #40 instead.