Removed copying iteration data into intermediate array. Now r-of-rho... results using python optimization and C# Solve are identical.

Author: hayakawa16

inverse-solutions/r-of-fx-multi-op-prop-inversion.py

@@ -73,10 +73,7 @@ def CalculateReflectanceVsWavelengthFromChromophoreConcAndScatterer(
    modelDataLocal=np.concatenate(
         [np.array(forwardSolver.ROfFx(opsLocal, fxs[0]), dtype=float), 
          np.array(forwardSolver.ROfFx(opsLocal, fxs[1]), dtype=float)])
-   modelDataForReturn=Array.CreateInstance(float, len(wavelengths)*len(fxs))
-   for i in range(0, len(fxs)*len(wavelengths)-1):
-        modelDataForReturn[i] = modelDataLocal[i]
-   return modelDataForReturn
+   return modelDataLocal
 
 # func for residual
 def residual(valuesSought, wavelengths, fxs, measuredROfFx, forwardSolver):

inverse-solutions/r-of-rho-multi-op-prop-inversion-using-csharp-solve.py

@@ -64,11 +64,7 @@ def CalculateReflectanceFuncVsWavelengthFromChromophoreConcentration(
        chromophoreConcentration[0],chromophoreConcentration[1],chromophoreConcentration[2]))
     # Compute reflectance for local absorbers
     modelDataLocal = forwardSolverForInversion.ROfRho(opsLocal, params[1]) 
-    modelDataLocalCSharp = Array.CreateInstance(float, len(wavelengths))
-    # convert to C# format
-    for i in range(0, len(params[0])-1):
-      modelDataLocalCSharp[i] = modelDataLocal[i]
-    return modelDataLocalCSharp
+    return modelDataLocal
 
 # Convert the Python function to a .NET Func delegate
 forward_func = Func[Array[float], Array[Object], Array[float]](CalculateReflectanceFuncVsWavelengthFromChromophoreConcentration)

inverse-solutions/r-of-rho-multi-op-prop-inversion.py

@@ -65,10 +65,7 @@ def CalculateReflectanceVsWavelengthFromChromophoreConcentration(
    # Compute reflectance for local absorbers
    modelDataLocal = Array.CreateInstance(float, len(wavelengths))
    modelDataLocal = forwardSolver.ROfRho(opsLocal, rho) 
-   modelDataForReturn= Array.CreateInstance(float, len(wavelengths))
-   for i in range(0, len(wavelengths)):
-        modelDataForReturn[i] = modelDataLocal[i]
-   return modelDataForReturn
+   return modelDataLocal
 
 # func for residual
 def residual(chromophoreConcentration, wavelengths, rho, scatterer, measuredROfRho, forwardSolver):