Bug fix and speed up in KillingCocycle

[angeldelriomateos]

Bug corrects a wrong rewritting of the input Speed up in checking whether a cyclic algebra (K/F,a) is split because a is the norm of a root of 1.

I compared manually the files and noticed that besides the the differences made by this commit there are many other differences which should stay as in the file in Github. So only the differences in lines 2293-2297 and 2389-2400 in the new file should be include them. The other ones should stay as the are now.

[olexandr-konovalov]

Thanks @angeldelriomateos! First, you are again submitting it from divalg branch, not from a feature branch. Second, your divalg is our of sync. Please try to fix this as follows:

git checkout divalg
git pull origin divalg --rebase
git push angeldelriomateos --force

If this will not work, we will try it together later.

[angeldelriomateos]

Thanks @angeldelriomateos! First, you are again submitting it from divalg branch, not from a feature branch. Second, your divalg is our of sync. Please try to fix this as follows:

git checkout divalg
git pull origin divalg --rebase
git push angeldelriomateos --force

If this will not work, we will try it together later.

I did it but it seems to me that nothing change in my computer. For example I still have FactoringCycAlg which we dropped long time ago, commented lines in GlobalSplittingOfCyclotomicAlgebra which I believe somebody deleted before and some code which I think that Allen modified to allow arbitrary generated Galois groups. So I think that I still have an old version. PR#77 still have this differences

[olexandr-konovalov]

Ok, thanks! I have decided for now it's easier if I will resubmit actually needed changes in #78 - please check that I did it right there.

Because you again made changes directly in divalg instead of creating a new branch, your divalg now diverged from the one in the main repository. You need to reset it to be the same as the main one, otherwise these problems will hunt us again.

So, I am assuming that at this point you can do this, since you do not have any unsaved work or commits in your divalg that are not pushed elsewhere or made into PRs (otherwise, they will be erased). Then please do:

git fetch origin 
git checkout divalg
git reset --hard origin/divalg

For the next work, please remember first to do

git checkout divalg
git pull

and then create a new branche off divalg

git checkout -n some-new-branch-name

and make changes there.

[angeldelriomateos]

I did as you told me and now locally I do not have the last changes I made. This means that I need to commit again my changes but remember to create a new branch for that

[angeldelriomateos]

I tried to do git checkout -n some-new-branch-name but I got an error message. I guess the -n is a typo. It should be -b. Correct?

[olexandr-konovalov]

Oops sorry - of course git checkout -b some-new-branch-name