Skip to content

Commit

Permalink
Improved build script for standalone library, corrected XML documenta…
Browse files Browse the repository at this point in the history
…tion and corrected target processor in Release/x86 project build configuration.
  • Loading branch information
anders9ustafsson committed Feb 28, 2012
1 parent 862d825 commit 0bb038a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Ipopt*.dll
/Cureos.Numerics.dll
/build/*.txt
/build/*.dll
/build/*.pdb
/build/*.xml
/build/*.exe
*.txt
/Cureos.Numerics/Tests.Cureos.Numerics/bin/
Expand Down
2 changes: 1 addition & 1 deletion Cureos.Numerics/Cureos.Numerics/Cureos.Numerics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>Itanium</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<CodeAnalysisLogFile>bin\Release\Cureos.Numerics.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
Expand Down
2 changes: 1 addition & 1 deletion build/build_library.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
csc /target:library /out:Cureos.Numerics.dll ..\src\IpoptProblem.cs ..\src\IpoptAdapter.cs ..\src\IpoptAlgorithmMode.cs ..\src\IpoptReturnCode.cs ..\src\IpoptBoolType.cs ..\src\IpoptIndexStyle.cs
csc /platform:anycpu /target:library /debug:pdbonly /optimize /doc:Cureos.Numerics.xml /out:Cureos.Numerics.dll ..\src\IpoptProblem.cs ..\src\IpoptAdapter.cs ..\src\IpoptAlgorithmMode.cs ..\src\IpoptReturnCode.cs ..\src\IpoptBoolType.cs ..\src\IpoptIndexStyle.cs
10 changes: 5 additions & 5 deletions src/IpoptProblem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ public IpoptProblem(int n, double[] x_L, double[] x_U, int m, double[] g_L, doub
}

/// <summary>
/// Constructor for creating a subclassed Ipopt Problem object using
/// Constructor for creating a subclassed Ipopt Problem object using managed or
/// native function delegates. This is the preferred constructor when
/// subclassing IpoptProblem. Prerequisite is that the native optimization
/// subclassing IpoptProblem. Prerequisite is that the managed/native optimization
/// function delegates are implemented in the inheriting class.
/// This function
/// initializes an object that can be passed to the IpoptSolve call. It
Expand Down Expand Up @@ -435,9 +435,9 @@ public IpoptProblem(int n, double[] x_L, double[] x_U, int m, double[] g_L, doub
/// <param name="useNativeCallbackFunctions">If set to true, native callback functions are used to setup
/// the Ipopt problem; if set to false, managed callback functions are used.</param>
/// <param name="useHessianApproximation">If set to true, the Ipopt optimizer creates a limited memory
/// Hessian approximation and <see cref="eval_h"/> need not be implemented. If set to false, an exact Hessian
/// should be evaluated using <see cref="eval_h"/>.</param>
/// <param name="useIntermediateCallback">If set to true, the method <see cref="intermediate"/>will be called
/// Hessian approximation and the eval_h (managed or native) method need not be implemented.
/// If set to false, an exact Hessian should be evaluated using the appropriate Hessian evaluation method.</param>
/// <param name="useIntermediateCallback">If set to true, the intermediate method (managed or native) will be called
/// after each full iteration. If false, the intermediate callback function will not be called.</param>
protected IpoptProblem(int n, double[] x_L, double[] x_U, int m, double[] g_L, double[] g_U, int nele_jac, int nele_hess,
bool useNativeCallbackFunctions = false, bool useHessianApproximation = false, bool useIntermediateCallback = false)
Expand Down

0 comments on commit 0bb038a

Please sign in to comment.