Merge pull request #72 from bruker-biosensors/feature/minor_revisions

Feature/minor revisions

Author: AdrianDBS

Build.targets

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <RootRevision>3b5475ca350bd5e50b58fd2d8642051ee0c19916</RootRevision>
+    <RootRevision>v6-36-08</RootRevision>
     <RootGitPath>$(MSBuildThisFileDirectory)minuit2.net/obj/root</RootGitPath>
     <SwigOutputPath>$(MSBuildThisFileDirectory)/minuit2.net/obj/gen</SwigOutputPath>
   </PropertyGroup>
@@ -33,11 +33,11 @@
           WorkingDirectory="$(RootGitPath)"/>
 
     <!-- Fetch only the specific commit without history -->
-    <Exec Command="git fetch --depth 1 --no-tags origin $(RootRevision)"
+    <Exec Command="git fetch --depth 1 --no-tags origin tag $(RootRevision)"
           WorkingDirectory="$(RootGitPath)"/>
 
     <!-- Checkout the fetched commit -->
-    <Exec Command="git checkout $(RootRevision)"
+    <Exec Command="git checkout FETCH_HEAD"
           WorkingDirectory="$(RootGitPath)"/>
   </Target>
 

minuit2.net/CostFunctions/CostFunction.cs

@@ -381,68 +381,6 @@ public static ICostFunction LeastSquares(
             errorDefinitionInSigma,
             false);
     }
-    
-    public static ICostFunction LeastSquaresWithGaussNewtonApproximation(
-        IReadOnlyList<double> x,
-        IReadOnlyList<double> y,
-        IReadOnlyList<string> parameters,
-        Func<double, IReadOnlyList<double>, double> model,
-        Func<double, IReadOnlyList<double>, IReadOnlyList<double>> modelGradient,
-        double errorDefinitionInSigma = 1)
-    {
-        DataValidation.EnsureMatchingSizesBetween((x, nameof(x)), (y, nameof(y)));
-        return new LeastSquaresWithGaussNewtonApproximation(
-            x,
-            y,
-            _ => 1,
-            parameters,
-            model,
-            modelGradient,
-            errorDefinitionInSigma,
-            true);
-    }
-    
-    public static ICostFunction LeastSquaresWithGaussNewtonApproximation(
-        IReadOnlyList<double> x,
-        IReadOnlyList<double> y,
-        double yError,
-        IReadOnlyList<string> parameters,
-        Func<double, IReadOnlyList<double>, double> model,
-        Func<double, IReadOnlyList<double>, IReadOnlyList<double>> modelGradient,
-        double errorDefinitionInSigma = 1)
-    {
-        DataValidation.EnsureMatchingSizesBetween((x, nameof(x)), (y, nameof(y)));
-        return new LeastSquaresWithGaussNewtonApproximation(
-            x,
-            y,
-            _ => yError,
-            parameters,
-            model,
-            modelGradient,
-            errorDefinitionInSigma,
-            false);
-    }
-    
-    public static ICostFunction LeastSquaresWithGaussNewtonApproximation(
-        IReadOnlyList<double> x,
-        IReadOnlyList<double> y,
-        IReadOnlyList<double> yError,
-        IReadOnlyList<string> parameters,
-        Func<double, IReadOnlyList<double>, double> model,
-        Func<double, IReadOnlyList<double>, IReadOnlyList<double>> modelGradient,
-        double errorDefinitionInSigma = 1)
-    {
-        DataValidation.EnsureMatchingSizesBetween((x, nameof(x)), (y, nameof(y)), (yError, nameof(yError)));
-        return new LeastSquaresWithGaussNewtonApproximation(
-            x,
-            y,
-            i => yError[i],
-            parameters,
-            model,
-            modelGradient,
-            errorDefinitionInSigma,
-            false);
-    }
 
     public static ICostFunction Sum(params ICostFunction[] components) => new CostFunctionSum(components);
 }

minuit2.net/CostFunctions/LeastSquaresWithGaussNewtonApproximation.cs

@@ -11,7 +11,7 @@ public static MnUserParameterState AsState(this IEnumerable<ParameterConfigurati
 
     private static void Add(this MnUserParameterState state, ParameterConfiguration parameter)
     {
-        state.Add(parameter.Name, parameter.Value, parameter.Value * 0.01);
+        state.Add(parameter.Name, parameter.Value, parameter.Value == 0 ? 1 : parameter.Value * 0.01);
 
         if (parameter.IsFixed) 
             state.Fix(parameter.Name);

minuit2.net/ParameterConfigurationExtensions.cs

@@ -35,13 +35,10 @@ public class LeastSquaresCostBuilder(
         private bool _hasYErrors = true;
         private bool _hasGradient;
         private bool _hasHessian;
-        private bool _isUsingGaussNewtonApproximation;
         private double _errorDefinitionInSigma = 1;
 
         public ICostFunction Build() => _hasYErrors switch
         {
-            true when _isUsingGaussNewtonApproximation => CostFunction.LeastSquaresWithGaussNewtonApproximation(xValues, yValues, yError, _parameterNames, model, modelGradient, _errorDefinitionInSigma),
-            false when _isUsingGaussNewtonApproximation => CostFunction.LeastSquaresWithGaussNewtonApproximation(xValues, yValues, _parameterNames, model, modelGradient, _errorDefinitionInSigma),
             true when _hasHessian => CostFunction.LeastSquares(xValues, yValues, yError, _parameterNames, model, modelGradient, modelHessian, _errorDefinitionInSigma),
             false when _hasHessian => CostFunction.LeastSquares(xValues, yValues, _parameterNames, model, modelGradient, modelHessian, _errorDefinitionInSigma),
             true when _hasGradient => CostFunction.LeastSquares(xValues, yValues, yError, _parameterNames, model, modelGradient, _errorDefinitionInSigma),
@@ -68,12 +65,6 @@ public LeastSquaresCostBuilder WithHessian(bool hasHessian = true)
             return this;
         }
 
-        public LeastSquaresCostBuilder UsingGaussNewtonApproximation(bool isUsingGaussNewtonApproximation = true)
-        {
-            _isUsingGaussNewtonApproximation = isUsingGaussNewtonApproximation;
-            return this;
-        }
-        
         public LeastSquaresCostBuilder WithErrorDefinition(double sigma)
         {
             _errorDefinitionInSigma = sigma;