Resolved conflicts

JuliaNLSolvers · Nov 2, 2021 · 6fd5d24 · 6fd5d24
1 parent d668298
commit 6fd5d24
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/src/curve_fit.jl b/src/curve_fit.jl
@@ -145,13 +145,8 @@ function curve_fit(model, jacobian_model,
     end
 end
 
-<<<<<<< HEAD
 function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray, p0::AbstractArray; inplace = false, kwargs...)
     check_data_health(xdata, ydata)
-=======
-function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray{T}, p0::AbstractArray; inplace = false, kwargs...) where T
-    check_data_health(xdata, ydata, wt)
->>>>>>> Added check function for weighted data
     # construct a weighted cost function, with a vector weight for each ydata
     # for example, this might be wt = 1/sigma where sigma is some error term
     u = sqrt.(wt) # to be consistant with the matrix form
@@ -166,13 +161,8 @@ function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::Abstra
 end
 
 function curve_fit(model, jacobian_model,
-<<<<<<< HEAD
             xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray, p0::AbstractArray; inplace = false, kwargs...)
     check_data_health(xdata, ydata)
-=======
-            xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray{T}, p0; inplace = false, kwargs...) where T
-    check_data_health(xdata, ydata, wt)
->>>>>>> Added check function for weighted data
     u = sqrt.(wt) # to be consistant with the matrix form
 
     if inplace
@@ -186,13 +176,8 @@ function curve_fit(model, jacobian_model,
     end
 end
 
-<<<<<<< HEAD
 function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::AbstractMatrix, p0::AbstractArray; kwargs...)
     check_data_health(xdata, ydata)
-=======
-function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray{T,2}, p0; kwargs...) where T
-    check_data_health(xdata, ydata, wt)
->>>>>>> Added check function for weighted data
 
     # as before, construct a weighted cost function with where this
     # method uses a matrix weight.
@@ -208,13 +193,8 @@ function curve_fit(model, xdata::AbstractArray, ydata::AbstractArray, wt::Abstra
 end
 
 function curve_fit(model, jacobian_model,
-<<<<<<< HEAD
             xdata::AbstractArray, ydata::AbstractArray, wt::AbstractMatrix, p0::AbstractArray; kwargs...)
     check_data_health(xdata, ydata)
-=======
-            xdata::AbstractArray, ydata::AbstractArray, wt::AbstractArray{T,2}, p0; kwargs...) where T
-    check_data_health(xdata, ydata, wt)
->>>>>>> Added check function for weighted data
 
     u = cholesky(wt).U