Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug in weighted means per Simon. #24

Merged
merged 2 commits into from Jul 17, 2016
Merged

Fixed bug in weighted means per Simon. #24

merged 2 commits into from Jul 17, 2016

Conversation

bowring
Copy link
Member

@bowring bowring commented Jul 17, 2016

Also set default value of minIndex assigned to an isotopicRatio as -2 to serve as a logic check in Step 3.

@bowring bowring merged commit 03b9888 into master Jul 17, 2016
@bowring bowring deleted the rev2 branch July 17, 2016 16:32
RealMatrix resid = new BlockRealMatrix(n, 1);
for (int i = 0; i < n; i++) {
resid.setEntry(i, 0, y[i] - (slope * x[i]) - intercept);
}

RealMatrix residT = resid.transpose();
RealMatrix mM = residT.multiply(omega).multiply(resid);
RealMatrix mM = residT.multiply(invOmega).multiply(resid);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the fix?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes - a typo in the Wiki had omega instead of invOmega

On Sun, Jul 17, 2016 at 7:01 PM, John Zeringue notifications@github.com
wrote:

In
src/main/java/org/cirdles/calamari/algorithms/WeightedMeanCalculators.java
https://github.com/bowring/Calamari/pull/24#discussion_r71091606:

     RealMatrix resid = new BlockRealMatrix(n, 1);
     for (int i = 0; i < n; i++) {
         resid.setEntry(i, 0, y[i] - (slope * x[i]) - intercept);
     }

     RealMatrix residT = resid.transpose();
  •    RealMatrix mM = residT.multiply(omega).multiply(resid);
    
  •    RealMatrix mM = residT.multiply(invOmega).multiply(resid);
    

Is this the fix?


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
https://github.com/bowring/Calamari/pull/24/files/055428b7ee700f8f233dde977d14468543bab4d3..ebd7d1f831863f6c3465da01aaf7e0d97f2ba7cc#r71091606,
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABCtYz9H5LcYz7T5HcLt6gm07d5cyWhrks5qWrRIgaJpZM4JOQe3
.

Jim Bowring
C. Richard Crosby Distinguished Teaching Co-Chair
Principal Investigator, www.CIRDLES.org, www.github.com/cirdles
GitHub: https://github.com/bowring

Computer Science
College of Charleston
66 George Street
Charleston, SC 29424

Google Voice: 843.608.1399 (preferred)
Google Email: bowring@gmail.com

Office:
Harbor Walk East (360 Concord Street) Room 308
843.953.0805
http://stono.cs.cofc.edu/~bowring/
bowringj@cofc.edu

R. Buckminster Fuller (1972):
If humanity is to survive aboard our planet, it must become universally
literate and preoccupied with inherently cooperative Comprehensive
Anticipatory Design Science in which every human is concerned with
accomplishing the comfortably sustainable well-faring of all other humans.

johnzeringue added a commit to johnzeringue/Calamari that referenced this pull request Jul 17, 2016
Updated and reenabled the expected reports to match the output of CIRDLES#24.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants