Skip to content

Commit 44e41dc

Browse files
committed
Rename NonlinearObjectiveFunction to NonlinearObjectiveModel to better reflect its purpose in modeling optimization problems
1 parent 84e9432 commit 44e41dc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Numerics/Optimization/ObjectiveFunction.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static IObjectiveModel NonlinearModel(Func<Vector<double>, Vector<double>
122122
Func<Vector<double>, Vector<double>, Matrix<double>> derivatives,
123123
Vector<double> observedX, Vector<double> observedY, Vector<double> weight = null)
124124
{
125-
var objective = new NonlinearObjectiveFunction(function, derivatives);
125+
var objective = new NonlinearObjectiveModel(function, derivatives);
126126
objective.SetObserved(observedX, observedY, weight);
127127
return objective;
128128
}
@@ -134,7 +134,7 @@ public static IObjectiveModel NonlinearModel(Func<Vector<double>, Vector<double>
134134
Vector<double> observedX, Vector<double> observedY, Vector<double> weight = null,
135135
int accuracyOrder = 2)
136136
{
137-
var objective = new NonlinearObjectiveFunction(function, accuracyOrder: accuracyOrder);
137+
var objective = new NonlinearObjectiveModel(function, accuracyOrder: accuracyOrder);
138138
objective.SetObserved(observedX, observedY, weight);
139139
return objective;
140140
}
@@ -168,7 +168,7 @@ Matrix<double> Prime(Vector<double> point, Vector<double> x)
168168
return derivativeValues;
169169
}
170170

171-
var objective = new NonlinearObjectiveFunction(Func, Prime);
171+
var objective = new NonlinearObjectiveModel(Func, Prime);
172172
objective.SetObserved(observedX, observedY, weight);
173173
return objective;
174174
}
@@ -191,7 +191,7 @@ Vector<double> Func(Vector<double> point, Vector<double> x)
191191
return functionValues;
192192
}
193193

194-
var objective = new NonlinearObjectiveFunction(Func, accuracyOrder: accuracyOrder);
194+
var objective = new NonlinearObjectiveModel(Func, accuracyOrder: accuracyOrder);
195195
objective.SetObserved(observedX, observedY, weight);
196196
return objective;
197197
}
@@ -203,7 +203,7 @@ public static IObjectiveFunction NonlinearFunction(Func<Vector<double>, Vector<d
203203
Func<Vector<double>, Vector<double>, Matrix<double>> derivatives,
204204
Vector<double> observedX, Vector<double> observedY, Vector<double> weight = null)
205205
{
206-
var objective = new NonlinearObjectiveFunction(function, derivatives);
206+
var objective = new NonlinearObjectiveModel(function, derivatives);
207207
objective.SetObserved(observedX, observedY, weight);
208208
return objective.ToObjectiveFunction();
209209
}
@@ -216,7 +216,7 @@ public static IObjectiveFunction NonlinearFunction(Func<Vector<double>, Vector<d
216216
Vector<double> observedX, Vector<double> observedY, Vector<double> weight = null,
217217
int accuracyOrder = 2)
218218
{
219-
var objective = new NonlinearObjectiveFunction(function, null, accuracyOrder: accuracyOrder);
219+
var objective = new NonlinearObjectiveModel(function, null, accuracyOrder: accuracyOrder);
220220
objective.SetObserved(observedX, observedY, weight);
221221
return objective.ToObjectiveFunction();
222222
}

0 commit comments

Comments
 (0)