tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Cleanup solutions

pull/259/head
Christoph Ruegg 12 years ago
parent
7ae5af5a15
commit
2dc8672d23
9 changed files with 48 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      MathNet.Numerics.All.sln
  2. 5
      MathNet.Numerics.Data.sln
  3. 16
      MathNet.Numerics.Portable.sln
  4. 13
      MathNet.Numerics.sln
  5. 4
      src/FSharpUnitTests/App.config
  6. 41
      src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj
  7. 4
      src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs
  8. 4
      src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs
  9. 13
      src/UnitTests/UnitTests-Net35.csproj

3
MathNet.Numerics.All.sln
View File

@ -52,7 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec
build\packages.config = build\packages.config
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net35", "src\FSharp\FSharp-Net35.fsproj", "{D5DBCEC0-9D9D-4A62-9EE0-F78E1895D4F4}"

5
MathNet.Numerics.Data.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Matlab", "src\Data\Matlab\Matlab.csproj", "{550FB330-C86F-4C9D-9B4C-6D830CEB7520}"
EndProject
@ -25,7 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D954831A
build.fsx = build.fsx
build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec
build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec
build\packages.config = build\packages.config
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Global

16
MathNet.Numerics.Portable.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}"
ProjectSection(SolutionItems) = preProject
@ -45,17 +45,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
build\packages.config = build\packages.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{305FCCF4-B205-4E98-B58A-48117C3CA4E3}"
ProjectSection(SolutionItems) = preProject
build\NuGet\FSharp\MathNet.Numerics.FSharp.nuspec = build\NuGet\FSharp\MathNet.Numerics.FSharp.nuspec
build\NuGet\FSharp.Signed\MathNet.Numerics.FSharp.Signed.nuspec = build\NuGet\FSharp.Signed\MathNet.Numerics.FSharp.Signed.nuspec
build\NuGet\Numerics\MathNet.Numerics.nuspec = build\NuGet\Numerics\MathNet.Numerics.nuspec
build\NuGet\Numerics.Signed\MathNet.Numerics.Signed.nuspec = build\NuGet\Numerics.Signed\MathNet.Numerics.Signed.nuspec
build\NuGet\nuget-signed.proj = build\NuGet\nuget-signed.proj
build\NuGet\nuget.proj = build\NuGet\nuget.proj
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Global
@ -147,7 +138,6 @@ Global
{2B6BE5F8-843E-4E36-8B8E-9CA3C9503198} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E}
{8A60894F-D090-4FC5-9535-E244E90A44C1} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E}
{EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E}
{305FCCF4-B205-4E98-B58A-48117C3CA4E3} = {B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Numerics\Numerics.csproj

13
MathNet.Numerics.sln
View File

@ -25,16 +25,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4A66FA9-C00C-4D5C-A776-27516EA0C536}"
ProjectSection(SolutionItems) = preProject
docs\tools\build-docs.fsx = docs\tools\build-docs.fsx
build.fsx = build.fsx
build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec
build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec
build\packages.config = build\packages.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{DB89F4DB-5204-4B38-B9F5-FE11E69D32AD}"
ProjectSection(SolutionItems) = preProject
docs\tools\build-docs.fsx = docs\tools\build-docs.fsx
docs\tools\packages.config = docs\tools\packages.config
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{039229DA-AFDA-48DB-B7FC-B064691DEE96}"
@ -97,9 +93,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{DB89F4DB-5204-4B38-B9F5-FE11E69D32AD} = {A4A66FA9-C00C-4D5C-A776-27516EA0C536}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Numerics\Numerics.csproj
EndGlobalSection

4
src/FSharpUnitTests/App.config
View File

@ -4,9 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="2.0.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="2.3.5.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />

41
src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj
View File

@ -18,9 +18,9 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>..\..\out\test\Net40\</OutputPath>
<IntermediateOutputPath>..\..\obj\test\Net40\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test\Net40\</BaseIntermediateOutputPath>
<OutputPath>..\..\out\test\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test\Net35\</BaseIntermediateOutputPath>
<DefineConstants>TRACE;NET35;NOSYSNUMERICS</DefineConstants>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
@ -29,9 +29,9 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>..\..\out\test-debug\Net40\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-debug\Net40\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-debug\Net40\</BaseIntermediateOutputPath>
<OutputPath>..\..\out\test-debug\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-debug\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-debug\Net35\</BaseIntermediateOutputPath>
<DefineConstants>DEBUG;TRACE;NET35;NOSYSNUMERICS</DefineConstants>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
@ -41,19 +41,21 @@
<Tailcalls>true</Tailcalls>
<DefineConstants>TRACE;NET35;NOSYSNUMERICS</DefineConstants>
<WarningLevel>3</WarningLevel>
<OutputPath>..\..\out\test-signed\Net40\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-signed\Net40\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-signed\Net40\</BaseIntermediateOutputPath>
<OutputPath>..\..\out\test-signed\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-signed\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-signed\Net35\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup>
<!-- Workaround - remove once no longer needed! -->
<DefineConstants>$(DefineConstants);NOFSSLICESET1D</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
<PropertyGroup Condition="'$(VisualStudioVersion)' == '11.0' Or $(OS) != 'Windows_NT'">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="VectorTests.fs" />
@ -69,9 +71,11 @@
<Compile Include="FitTests.fs" />
<Compile Include="FindRootsTests.fs" />
<None Include="paket.references" />
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<ProjectReference Include="..\FSharp\FSharp-Net35.fsproj">
<Name>FSharp-Net35</Name>
<Project>{d5dbcec0-9d9d-4a62-9ee0-f78e1895d4f4}</Project>
@ -83,13 +87,6 @@
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
<PropertyGroup Condition="'$(VisualStudioVersion)' == '11.0' Or $(OS) != 'Windows_NT'">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>

4
src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs
View File

@ -203,7 +203,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
{
for (var j = 0; j < matrixB.ColumnCount; j++)
{
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9);
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8);
}
}
@ -294,7 +294,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
{
for (var j = 0; j < matrixB.ColumnCount; j++)
{
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9);
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8);
}
}

4
src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs
View File

@ -202,7 +202,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
{
for (var j = 0; j < matrixB.ColumnCount; j++)
{
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9);
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8);
}
}
@ -293,7 +293,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
{
for (var j = 0; j < matrixB.ColumnCount; j++)
{
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9);
Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8);
}
}

13
src/UnitTests/UnitTests-Net35.csproj
View File

@ -40,6 +40,19 @@
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Signed|AnyCPU' ">
<DefineConstants>TRACE;NET35;NOSYSNUMERICS</DefineConstants>
<OutputPath>..\..\out\test-signed\Net35\</OutputPath>
<IntermediateOutputPath>..\..\obj\test-signed\Net35\</IntermediateOutputPath>
<BaseIntermediateOutputPath>..\..\obj\test-signed\Net35\</BaseIntermediateOutputPath>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>1591</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />

Write Preview
Loading…
Cancel
Save