[
https://issues.apache.org/jira/browse/MATH-1290?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15237769#comment-15237769
]
Eric Barnhill commented on MATH-1290:
-------------------------------------
My fault Gilles, those instructions are backwards from what you want. I think
you want to:
1) check out your branch feature-MATH-1290. Should be possible, within your
commons-math folder by
git checkout feature-MATH-1290
2) set up a new branch for my pull request from feature-MATH-1290 branch. I
think you can do this with
git branch barnhill-pull
3) be in the new branch
git checkout barnhill-pull
4) set up a remote for my stuff. I think this will work:
git remote add barnhill-master
https://github.com/ericbarnhill/commons-math.git
5) pull my edits into this new branch
git pull barnhill-master (or possibly git checkout barnhill-master)
6) commit the edits
git commit -a -m "commited barnhill-master to barnhill-pull"
7) go back to the feature-MATH-1290 branch
git checkout feature-MATH-1290
8) merge the barnhill-pull branch into the feature-MATH-1290 branch
git merge barnhill-pull
9) resolve any differences with a merge tool (like I said, I got rid of a few
periods etc)
git mergetool
10) now commit those edits
git commit -a -m "merged barnhill-pull into feature-MATH-1290"
11) now the two branches are merged as you want. you can then push back to git,
or to the apache server, etc. You can also run mvn site to make sure it's clean
and use git checkout to overwrite anything you want to revert
Sorry for no formatting, typical markdown doesn't seem to be working for me :)
> Additions to Complex Utils; creation of conversion methods between Complex[],
> double[], float[], and interleaved arrays
> -----------------------------------------------------------------------------------------------------------------------
>
> Key: MATH-1290
> URL: https://issues.apache.org/jira/browse/MATH-1290
> Project: Commons Math
> Issue Type: Improvement
> Affects Versions: 3.5
> Reporter: Eric Barnhill
> Priority: Minor
> Labels: newbie, patch
> Fix For: 4.0
>
> Attachments: ComplexUtils.java, ComplexUtils.java, ComplexUtils.java,
> ComplexUtils.java, ComplexUtilsTest.java, ComplexUtilsTest.java,
> ComplexUtilsTest.java, ComplexUtilsTest.java, LaguerreSolver.java
>
> Original Estimate: 24h
> Remaining Estimate: 24h
>
> I propose to add several new methods to the ComplexUtils class enabling easy
> conversion between Complex[] arrays, real or imaginary double[] or float[]
> arrays, and interleaved complex double[] or float[] arrays. The last two in
> particular are beneficial to have for OpenCL implementations and the
> JTransforms library.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
