search

JuliaSmoothOptimizers / PartitionedStructures.jl

Partitioned derivatives storage and partitioned quasi-Newton updates
Other
10 stars 1 forks source link

Internal partitioned structures #35

Closed paraynaud closed 1 year ago

paraynaud commented 2 years ago

This time the code is in the PR

dpo commented 2 years ago

Conflicts to resolve here.

paraynaud commented 2 years ago

I manually added the internal files. Some fixes are still needed. I will fix it in the day. I will do the same for the factorization #31 .

Next time I will have to save functionnailities in branch, I will proceed with an other strategy.

dpo commented 2 years ago

It should have been enough to create branches off of master with git checkout -b internal master and git checkout -b factorization master to save the functionality, and then open a PR to delete the files from `master.

paraynaud commented 2 years ago

I did git checkout -b factoritzation and git checkout -b internal from the master branch. But it didn't work. Is master at the end of the line changing anything?

dpo commented 2 years ago

If you're already on master when you issue those commands, it's the same thing.

dpo commented 2 years ago

Actually, note that there is no master here. It's called main. Is that the problem?

paraynaud commented 2 years ago

No, I was on main.

dpo commented 2 years ago

Ok. I'm confused now. This PR seems to be adding the internal variables stuff to main. What we want to do is remove it.

paraynaud commented 2 years ago

The internal structures are already out of the main branch. By merging #29, it deleted the internal structures files of the previous pull request (I don't know why). This pull request is not meant to be accepted but rather to save the changes incorporing internal-structure files.