[
https://issues.apache.org/jira/browse/MATH-1290?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15237608#comment-15237608
]
Rob Tompkins commented on MATH-1290:
------------------------------------
You might want to run a
{code:none}
git log
{code}
to see if the commits in question are already in the list of commits. I suspect
they are. To perform a re-merge, you could do the following (assuming that
"br") is the branch on origin to which we are merging
{code:none}
git checkout br
git fetch origin br
git reset --hard origin/br
git pull https://github.com/ericbarnhill/commons-math.git feature-MATH-1290
{code}
This essentially resets your local history to precisely the head of what is in
the main repo with the {{reset --hard}} command.
> 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)
