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

put Regression.VarianceObserved field name into camel case #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions regression.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Regression struct {
data []*dataPoint
coeff map[int]float64
R2 float64
Varianceobserved float64
VarianceObserved float64
VariancePredicted float64
initialised bool
Formula string
Expand Down Expand Up @@ -227,13 +227,13 @@ func (r *Regression) calcVariance() string {
obvar += math.Pow(r.data[i].Observed-obaverage, 2)
prvar += math.Pow(r.data[i].Predicted-praverage, 2)
}
r.Varianceobserved = obvar / float64(observations)
r.VarianceObserved = obvar / float64(observations)
r.VariancePredicted = prvar / float64(observations)
return fmt.Sprintf("N = %v\nVariance observed = %v\nVariance Predicted = %v\n", observations, r.Varianceobserved, r.VariancePredicted)
return fmt.Sprintf("N = %v\nVariance observed = %v\nVariance Predicted = %v\n", observations, r.VarianceObserved, r.VariancePredicted)
}

func (r *Regression) calcR2() string {
r.R2 = r.VariancePredicted / r.Varianceobserved
r.R2 = r.VariancePredicted / r.VarianceObserved
return fmt.Sprintf("R2 = %.2f", r.R2)
}

Expand Down Expand Up @@ -269,7 +269,7 @@ func (r *Regression) String() string {
str += fmt.Sprintf("%v\n", d)
}
fmt.Println(r.calcResiduals())
str += fmt.Sprintf("\nN = %v\nVariance observed = %v\nVariance Predicted = %v", len(r.data), r.Varianceobserved, r.VariancePredicted)
str += fmt.Sprintf("\nN = %v\nVariance observed = %v\nVariance Predicted = %v", len(r.data), r.VarianceObserved, r.VariancePredicted)
str += fmt.Sprintf("\nR2 = %v\n", r.R2)
return str
}