diff --git a/.gitignore b/.gitignore index 7b9bd64c..c26b3f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ output bin +obj out Thumbs.db TestResults diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln index 96d41dbb..7a4ad61d 100644 --- a/MathNet.Numerics.Portable.sln +++ b/MathNet.Numerics.Portable.sln @@ -1,56 +1,146 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4D50FB34-10BC-495A-8B2F-482E34B4D771}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" - ProjectSection(ProjectDependencies) = postProject - {49205185-621E-FFB9-2104-887C9F1BBD13} = {49205185-621E-FFB9-2104-887C9F1BBD13} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{49EE74BD-301F-4C3B-B76A-07F90CC88CE7}" + ProjectSection(SolutionItems) = preProject + build\FSharp.Formatting\build.fsx = build\FSharp.Formatting\build.fsx EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{81D2CBEF-1C80-4389-A341-F010E8F86CDB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}" + ProjectSection(SolutionItems) = preProject + CONTRIBUTING.md = CONTRIBUTING.md + CONTRIBUTORS.md = CONTRIBUTORS.md + LICENSE.md = LICENSE.md + MAINTAINING.md = MAINTAINING.md + README.md = README.md + RELEASENOTES.md = RELEASENOTES.md + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "src\Examples\Examples.csproj", "{8239A6FF-1EF3-4DA4-A860-95C392DD6899}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "src\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp", "src\FSharp\FSharp.fsproj", "{37E8E802-A354-4114-BFC1-6E1357DA605B}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpExamples", "src\FSharpExamples\FSharpExamples.fsproj", "{BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests", "src\FSharpUnitTests\FSharpUnitTests.fsproj", "{F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\UnitTests.csproj", "{DAF07AA8-C5C9-4963-98F7-2C3285064DAD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable47", "src\Numerics\Numerics-Portable47.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable136", "src\Numerics\Numerics-Portable136.csproj", "{C2581199-28C4-41AA-A26A-F0C076EA2A67}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable47", "src\FSharp\FSharp-Portable47.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable136", "src\FSharp\FSharp-Portable136.fsproj", "{D178918B-6AC0-4624-A515-4B99147B9FFD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable47", "src\UnitTests\UnitTests-Portable47.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable136", "src\UnitTests\UnitTests-Portable136.csproj", "{104E9129-FDC3-43CF-8687-9774C6D8C6C2}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable47", "src\FSharpUnitTests\FSharpUnitTests-Portable47.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestsPortable", "src\UnitTests\UnitTestsPortable.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable136", "src\FSharpUnitTests\FSharpUnitTests-Portable136.fsproj", "{1A8315AC-BCDA-4294-B994-FDC4FED45BEE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug47|Any CPU = Debug47|Any CPU - Release136|Any CPU = Release136|Any CPU - Release47|Any CPU = Release47|Any CPU + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + Release-Signed|Any CPU = Release-Signed|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU - {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug47|Any CPU.Build.0 = Debug47|Any CPU - {49205185-621E-FFB9-2104-887C9F1BBD13}.Release136|Any CPU.ActiveCfg = Release136|Any CPU - {49205185-621E-FFB9-2104-887C9F1BBD13}.Release136|Any CPU.Build.0 = Release136|Any CPU - {49205185-621E-FFB9-2104-887C9F1BBD13}.Release47|Any CPU.ActiveCfg = Release47|Any CPU - {49205185-621E-FFB9-2104-887C9F1BBD13}.Release47|Any CPU.Build.0 = Release47|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug47|Any CPU.Build.0 = Debug47|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release136|Any CPU.ActiveCfg = Release136|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release136|Any CPU.Build.0 = Release136|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release47|Any CPU.ActiveCfg = Release47|Any CPU - {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release47|Any CPU.Build.0 = Release47|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Debug47|Any CPU.Build.0 = Debug47|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.ActiveCfg = Release136|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.Build.0 = Release136|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.ActiveCfg = Release47|Any CPU - {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.Build.0 = Release47|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.Build.0 = Debug47|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.ActiveCfg = Release136|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.Build.0 = Release136|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.ActiveCfg = Release47|Any CPU - {0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.Build.0 = Release47|Any CPU + {8239A6FF-1EF3-4DA4-A860-95C392DD6899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8239A6FF-1EF3-4DA4-A860-95C392DD6899}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8239A6FF-1EF3-4DA4-A860-95C392DD6899}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8239A6FF-1EF3-4DA4-A860-95C392DD6899}.Release|Any CPU.Build.0 = Release|Any CPU + {8239A6FF-1EF3-4DA4-A860-95C392DD6899}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.Build.0 = Release|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Release|Any CPU.Build.0 = Release|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU + {37E8E802-A354-4114-BFC1-6E1357DA605B}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}.Release|Any CPU.Build.0 = Release|Any CPU + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Release|Any CPU.Build.0 = Release|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Release|Any CPU.Build.0 = Release|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU + {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49205185-621E-FFB9-2104-887C9F1BBD13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49205185-621E-FFB9-2104-887C9F1BBD13}.Release|Any CPU.Build.0 = Release|Any CPU + {49205185-621E-FFB9-2104-887C9F1BBD13}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67}.Release|Any CPU.Build.0 = Release|Any CPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release|Any CPU.Build.0 = Release|Any CPU + {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {D178918B-6AC0-4624-A515-4B99147B9FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D178918B-6AC0-4624-A515-4B99147B9FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D178918B-6AC0-4624-A515-4B99147B9FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D178918B-6AC0-4624-A515-4B99147B9FFD}.Release|Any CPU.Build.0 = Release|Any CPU + {D178918B-6AC0-4624-A515-4B99147B9FFD}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release|Any CPU.Build.0 = Release|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {104E9129-FDC3-43CF-8687-9774C6D8C6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {104E9129-FDC3-43CF-8687-9774C6D8C6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {104E9129-FDC3-43CF-8687-9774C6D8C6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {104E9129-FDC3-43CF-8687-9774C6D8C6C2}.Release|Any CPU.Build.0 = Release|Any CPU + {104E9129-FDC3-43CF-8687-9774C6D8C6C2}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {90CE8E32-354E-4728-8FE6-87342F469321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90CE8E32-354E-4728-8FE6-87342F469321}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90CE8E32-354E-4728-8FE6-87342F469321}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90CE8E32-354E-4728-8FE6-87342F469321}.Release|Any CPU.Build.0 = Release|Any CPU + {90CE8E32-354E-4728-8FE6-87342F469321}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE}.Release|Any CPU.Build.0 = Release|Any CPU + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {90CE8E32-354E-4728-8FE6-87342F469321} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB} - {0672ED13-CE61-4D3C-B879-282472817235} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB} + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {0672ED13-CE61-4D3C-B879-282472817235} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {104E9129-FDC3-43CF-8687-9774C6D8C6C2} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {90CE8E32-354E-4728-8FE6-87342F469321} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {1A8315AC-BCDA-4294-B994-FDC4FED45BEE} = {4D50FB34-10BC-495A-8B2F-482E34B4D771} + {8239A6FF-1EF3-4DA4-A860-95C392DD6899} = {49EE74BD-301F-4C3B-B76A-07F90CC88CE7} + {BC81EA37-8EE6-4BF9-B8A9-B30497AEF8B1} = {49EE74BD-301F-4C3B-B76A-07F90CC88CE7} EndGlobalSection EndGlobal diff --git a/MathNet.Numerics.Portable.sln.DotSettings b/MathNet.Numerics.Portable.sln.DotSettings index 7377cde6..a97eba6c 100644 --- a/MathNet.Numerics.Portable.sln.DotSettings +++ b/MathNet.Numerics.Portable.sln.DotSettings @@ -1,4 +1,6 @@  + <?xml version="1.0" encoding="utf-16"?><Profile name="Full Cleanup (Math.NET)"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUpdateFileHeader>True</CSUpdateFileHeader><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><XMLReformatCode>True</XMLReformatCode><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><JsReformatCode>True</JsReformatCode><JsInsertSemicolon>True</JsInsertSemicolon><VBFormatDocComments>True</VBFormatDocComments><VBReformatCode>True</VBReformatCode><VBShortenReferences>True</VBShortenReferences><VBOptimizeImports>True</VBOptimizeImports><HtmlReformatCode>True</HtmlReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><CSReorderTypeMembers>True</CSReorderTypeMembers><CSUseVar><BehavourStyle>CAN_CHANGE_BOTH</BehavourStyle><LocalVariableStyle>IMPLICIT_WHEN_INITIALIZER_HAS_TYPE</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar></Profile> + Full Cleanup (Math.NET) False False False @@ -11,7 +13,58 @@ False False True + False + False True False + <copyright file="$FILENAME$" company="Math.NET"> +Math.NET Numerics, part of the Math.NET Project +http://numerics.mathdotnet.com +http://github.com/mathnet/mathnet-numerics +http://mathnetnumerics.codeplex.com + +Copyright (c) 2009-$CURRENT_YEAR$ Math.NET + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +</copyright> + CDF + DFT + FFT + ILU + ILUTP + LU + MAE + MC + MCMC + MILU + MSE + PDF + QR + SAD + SAS + SPSS + SSD + SVD + TFQMR + WH <data /> <data><IncludeFilters /><ExcludeFilters /></data> \ No newline at end of file diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index 63e5a699..a24257d1 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4D50FB34-10BC-495A-8B2F-482E34B4D771}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{49EE74BD-301F-4C3B-B76A-07F90CC88CE7}" diff --git a/build/NuGet/nuget-signed.proj b/build/NuGet/nuget-signed.proj index 511b3eef..979b7e51 100644 --- a/build/NuGet/nuget-signed.proj +++ b/build/NuGet/nuget-signed.proj @@ -5,7 +5,7 @@ $(MSBuildProjectDirectory)/../../tools/NuGet/nuget.exe $(MSBuildProjectDirectory)/../.. - $(MSBuildProjectDirectory)/../../out/signed + $(MSBuildProjectDirectory)/../../out/lib-signed $(MSBuildProjectDirectory)/../../out/packages/NuGet $(MSBuildProjectDirectory)/Numerics.Signed $(MSBuildProjectDirectory)/FSharp.Signed diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj index 3c30418e..abb0d7d5 100644 --- a/build/NuGet/nuget.proj +++ b/build/NuGet/nuget.proj @@ -17,11 +17,11 @@ - - + + - - + + @@ -38,13 +38,13 @@ - - + + - - + + diff --git a/packages/NUnit.2.6.2/NUnit.2.6.2.nupkg b/packages/NUnit.2.6.2/NUnit.2.6.2.nupkg deleted file mode 100644 index 26f15bdc..00000000 Binary files a/packages/NUnit.2.6.2/NUnit.2.6.2.nupkg and /dev/null differ diff --git a/packages/NUnit.2.6.2/lib/nunit.framework.dll b/packages/NUnit.2.6.2/lib/nunit.framework.dll deleted file mode 100644 index 3e24ba1c..00000000 Binary files a/packages/NUnit.2.6.2/lib/nunit.framework.dll and /dev/null differ diff --git a/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg b/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg new file mode 100644 index 00000000..61e3a5ec Binary files /dev/null and b/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg differ diff --git a/packages/NUnit.2.6.2/NUnit.2.6.2.nuspec b/packages/NUnit.2.6.3/NUnit.2.6.3.nuspec similarity index 92% rename from packages/NUnit.2.6.2/NUnit.2.6.2.nuspec rename to packages/NUnit.2.6.3/NUnit.2.6.3.nuspec index 16320871..a5773095 100644 --- a/packages/NUnit.2.6.2/NUnit.2.6.2.nuspec +++ b/packages/NUnit.2.6.3/NUnit.2.6.3.nuspec @@ -2,7 +2,7 @@ NUnit - 2.6.2 + 2.6.3 NUnit Charlie Poole Charlie Poole @@ -22,6 +22,6 @@ Unlike earlier versions, this package includes only the framework assembly. You The nunit.mocks assembly is now provided by the NUnit.Mocks package. The pnunit.framework assembly is provided by the pNUnit package. en-US - test testing tdd framework fluent assert theory plugin addin + nunit test testing tdd framework fluent assert theory plugin addin \ No newline at end of file diff --git a/packages/NUnit.2.6.3/lib/nunit.framework.dll b/packages/NUnit.2.6.3/lib/nunit.framework.dll new file mode 100644 index 00000000..780727f2 Binary files /dev/null and b/packages/NUnit.2.6.3/lib/nunit.framework.dll differ diff --git a/packages/NUnit.2.6.2/license.txt b/packages/NUnit.2.6.3/license.txt similarity index 91% rename from packages/NUnit.2.6.2/license.txt rename to packages/NUnit.2.6.3/license.txt index 530a6e00..b12903af 100644 --- a/packages/NUnit.2.6.2/license.txt +++ b/packages/NUnit.2.6.3/license.txt @@ -1,4 +1,4 @@ -Copyright © 2002-2012 Charlie Poole +Copyright © 2002-2013 Charlie Poole Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov Copyright © 2000-2002 Philip A. Craig @@ -8,7 +8,7 @@ Permission is granted to anyone to use this software for any purpose, including 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required. -Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig +Portions Copyright © 2002-2013 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. diff --git a/src/FSharp/FSharp-Portable136.fsproj b/src/FSharp/FSharp-Portable136.fsproj new file mode 100644 index 00000000..829cce49 --- /dev/null +++ b/src/FSharp/FSharp-Portable136.fsproj @@ -0,0 +1,82 @@ + + + + + Debug + AnyCPU + 2.0 + {d178918b-6ac0-4624-a515-4b99147b9ffd} + Library + FSharpPortable + MathNet.Numerics.FSharp + v4.0 + Profile136 + FSharp-Portable136 + 11 + 2.3.5.0 + + + TRACE;PORTABLE;NOSYSNUMERICS + ..\..\out\lib\Profile136\ + ..\..\obj\lib\Profile136\ + ..\..\obj\lib\Profile136\ + ..\..\out\lib\Profile136\MathNet.Numerics.FSharp.XML + true + true + pdbonly + 3 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS + ..\..\out\lib-debug\Profile136\ + ..\..\obj\lib-debug\Profile136\ + ..\..\obj\lib-debug\Profile136\ + false + false + true + full + 3 + + + + + $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll + True + + + + + + + + + + + + + + + + + + + + Numerics-Portable136 + {c2581199-28c4-41aa-a26a-f0c076ea2a67} + True + + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets + + + + + \ No newline at end of file diff --git a/src/FSharp/FSharpPortable.fsproj b/src/FSharp/FSharp-Portable47.fsproj similarity index 61% rename from src/FSharp/FSharpPortable.fsproj rename to src/FSharp/FSharp-Portable47.fsproj index e863a270..3ecc5c4a 100644 --- a/src/FSharp/FSharpPortable.fsproj +++ b/src/FSharp/FSharp-Portable47.fsproj @@ -10,45 +10,38 @@ FSharpPortable MathNet.Numerics.FSharp v4.0 - FSharpPortable - 11 - - Profile47 - TRACE;DEBUG;PORTABLE - ..\..\out\debug\Portable47\ - false - false - true - full - 3 - + FSharp-Portable47 + 11 + 2.3.5.0 - - Profile47 + TRACE;PORTABLE - ..\..\out\lib\Portable47\ - ..\..\out\lib\Portable47\MathNet.Numerics.FSharp.XML + ..\..\out\lib\Profile47\ + ..\..\obj\lib\Profile47\ + ..\..\obj\lib\Profile47\ + ..\..\out\lib\Profile47\MathNet.Numerics.FSharp.XML true true pdbonly 3 - - Profile136 - TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\lib\Portable136\ - ..\..\out\lib\Portable136\MathNet.Numerics.FSharp.XML - true - true - pdbonly + + TRACE;DEBUG;PORTABLE + ..\..\out\lib-debug\Profile47\ + ..\..\obj\lib-debug\Profile47\ + ..\..\obj\lib-debug\Profile47\ + false + false + true + full 3 + - FSharp.Core - FSharp.Core.dll - $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\3.0\Runtime\.NETPortable\FSharp.Core.dll + $(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll + True @@ -67,11 +60,23 @@ - - Portable + + Numerics-Portable47 {49205185-621e-ffb9-2104-887c9f1bbd13} True - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets + + + + \ No newline at end of file diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index f3aa92ea..fe49ead1 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -15,29 +15,31 @@ ..\MathNet.Numerics.snk false - - - true - full - false - false - ..\..\out\debug\Net40\ - TRACE;DEBUG - 3 + 4.3.0.0 pdbonly true true ..\..\out\lib\Net40\ + ..\..\obj\lib\Net40\ + ..\..\obj\lib\Net40\ + ..\..\out\lib\Net40\MathNet.Numerics.FSharp.xml TRACE 3 - ..\..\out\lib\Net40\MathNet.Numerics.FSharp.xml false - - MathNet.Numerics.FSharp.XML + + true + full + false + false + ..\..\out\lib-debug\Net40\ + ..\..\obj\lib-debug\Net40\ + ..\..\obj\lib-debug\Net40\ + TRACE;DEBUG + 3 false @@ -47,17 +49,29 @@ true TRACE;STRONGNAME 3 - ..\..\out\signed\Net40\MathNet.Numerics.FSharp.xml - ..\..\out\signed\Net40\ + ..\..\out\lib-signed\Net40\ + ..\..\obj\lib-signed\Net40\ + ..\..\obj\lib-signed\Net40\ + ..\..\out\lib-signed\Net40\MathNet.Numerics.FSharp.xml true 11 - - - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + @@ -74,7 +88,9 @@ - + + True + diff --git a/src/FSharpExamples/FSharpExamples.fsproj b/src/FSharpExamples/FSharpExamples.fsproj index 35476da1..e274d2d0 100644 --- a/src/FSharpExamples/FSharpExamples.fsproj +++ b/src/FSharpExamples/FSharpExamples.fsproj @@ -12,6 +12,7 @@ v4.0 FSharpExamples + 4.3.0.0 true @@ -41,9 +42,19 @@ 11 - - - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + @@ -63,7 +74,9 @@ ..\..\packages\FSharp.Formatting.1.0.15\lib\net40\FSharp.CompilerBinding.dll True - + + True + ..\..\packages\FSharp.Formatting.1.0.15\lib\net40\FSharp.Markdown.dll True diff --git a/src/FSharpUnitTests/App.config b/src/FSharpUnitTests/App.config index d89f1d5b..0224f3dd 100644 --- a/src/FSharpUnitTests/App.config +++ b/src/FSharpUnitTests/App.config @@ -1,13 +1,20 @@ - + - - - + + + + + + + - + + + + \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable136.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable136.fsproj new file mode 100644 index 00000000..382a4167 --- /dev/null +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable136.fsproj @@ -0,0 +1,101 @@ + + + + + Debug + AnyCPU + 2.0 + {1a8315ac-bcda-4294-b994-fdc4fed45bee} + Library + FSharpPortableUnitTests + MathNet.Numerics.FSharp.UnitTests136 + v4.5 + FSharpUnitTests-Portable136 + 11 + 4.3.0.0 + + + TRACE;PORTABLE;NOSYSNUMERICS + ..\..\out\test\Profile136\ + ..\..\obj\test\Profile136\ + ..\..\obj\test\Profile136\ + true + true + pdbonly + 3 + + + + DEBUG;TRACE;PORTABLE;NOSYSNUMERICS + ..\..\out\test-debug\Profile136\ + ..\..\obj\test-debug\Profile136\ + ..\..\obj\test-debug\Profile136\ + false + false + true + full + 3 + + + + + $(DefineConstants);NOFSSLICESET1D + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + True + + + + + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + + ..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll + False + True + + + FSharp-Portable136 + {d178918b-6ac0-4624-a515-4b99147b9ffd} + True + + + Numerics-Portable136 + {c2581199-28c4-41aa-a26a-f0c076ea2a67} + True + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj similarity index 54% rename from src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj rename to src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj index c69528be..837ab74e 100644 --- a/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj @@ -8,53 +8,80 @@ 90ce8e32-354e-4728-8fe6-87342f469321 Library FSharpPortableUnitTests - MathNet.Numerics.FSharp.UnitTests + MathNet.Numerics.FSharp.UnitTests47 v4.5 - FSharpPortableUnitTests + FSharpUnitTests-Portable47 11 + 4.3.0.0 - - DEBUG;TRACE - ..\..\out\test\debug\Portable47\ - false - false - true - full - 3 - - - - TRACE - ..\..\out\test\Portable47\ + + TRACE;PORTABLE + ..\..\out\test\Profile47\ + ..\..\obj\test\Profile47\ + ..\..\obj\test\Profile47\ true true pdbonly 3 - - TRACE;NOSYSNUMERICS - ..\..\out\test\Portable136\ - true - true - pdbonly + + DEBUG;TRACE;PORTABLE + ..\..\out\test-debug\Profile47\ + ..\..\obj\test-debug\Profile47\ + ..\..\obj\test-debug\Profile47\ + false + false + true + full 3 - + + + $(DefineConstants);NOFSSLICESET1D + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + - - - ..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll + True - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + + ..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll + False + True + + + FSharp-Portable47 + {f5f14d76-428d-43d7-8431-5b885f1ba419} + True + + + Numerics-Portable47 + {49205185-621e-ffb9-2104-887c9f1bbd13} + True + @@ -72,16 +99,4 @@ - - - FSharpPortable - {f5f14d76-428d-43d7-8431-5b885f1ba419} - True - - - Portable - {49205185-621e-ffb9-2104-887c9f1bbd13} - True - - \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index 6cffd845..1c0bc508 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -9,54 +9,80 @@ Library FSharpUnitTests MathNet.Numerics.FSharp.UnitTests - v4.0 + v4.5 FSharpUnitTests - - - true - full - false - false - ..\..\out\test\debug\Net40\ - DEBUG;TRACE - 3 + 4.3.0.0 pdbonly true true ..\..\out\test\Net40\ + ..\..\obj\test\Net40\ + ..\..\obj\test\Net40\ TRACE 3 + + true + full + false + false + ..\..\out\test-debug\Net40\ + ..\..\obj\test-debug\Net40\ + ..\..\obj\test-debug\Net40\ + DEBUG;TRACE + 3 + pdbonly true true TRACE 3 - ..\..\out\test\signed\Net40\ + ..\..\out\test-signed\Net40\ + ..\..\obj\test-signed\Net40\ + ..\..\obj\test-signed\Net40\ + + + + $(DefineConstants);NOFSSLICESET1D 11 - - - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + - - - ..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll + True - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + + ..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll + False + True + FSharp {37e8e802-a354-4114-bfc1-6e1357da605b} @@ -84,11 +110,4 @@ - \ No newline at end of file diff --git a/src/FSharpUnitTests/VectorTests.fs b/src/FSharpUnitTests/VectorTests.fs index 7cc0f8ab..95f05338 100644 --- a/src/FSharpUnitTests/VectorTests.fs +++ b/src/FSharpUnitTests/VectorTests.fs @@ -26,6 +26,9 @@ module VectorTests = largev.[97..] |> should equal (DenseVector.raw [|0.97;0.98;0.99|]) largev.[..4] |> should equal (DenseVector.raw [|0.00;0.01;0.02;0.03;0.04|]) +#if NOFSSLICESET1D +#else +// Vector SetSlice does not work properly in VisualStudio 2013 RTM [] let ``Vector.SetSlice`` () = let v = smallv.Clone() in @@ -43,6 +46,7 @@ module VectorTests = let v = smallv.Clone() in v.[..2] <- vector [7.0;8.0;9.0]; v |> should equal (DenseVector.raw [|7.0;8.0;9.0;0.3;0.3|]) +#endif [] let ``Vector.toArray`` () = diff --git a/src/FSharpUnitTests/packages.config b/src/FSharpUnitTests/packages.config index 6f50ba2e..3afbe6ac 100644 --- a/src/FSharpUnitTests/packages.config +++ b/src/FSharpUnitTests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Numerics/Numerics-Portable136.csproj b/src/Numerics/Numerics-Portable136.csproj new file mode 100644 index 00000000..044fe9e3 --- /dev/null +++ b/src/Numerics/Numerics-Portable136.csproj @@ -0,0 +1,65 @@ + + + + + 10.0 + Debug + AnyCPU + {C2581199-28C4-41AA-A26A-F0C076EA2A67} + Library + Properties + MathNet.Numerics + MathNet.Numerics + v4.0 + Profile136 + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + TRACE;PORTABLE;NOSYSNUMERICS + ..\..\out\lib\Profile136\ + ..\..\obj\lib\Profile136\ + ..\..\obj\lib\Profile136\ + ..\..\out\lib\Profile136\MathNet.Numerics.XML + true + pdbonly + prompt + 4 + AllRules.ruleset + 1591 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS + ..\..\out\lib-debug\Profile136\ + ..\..\obj\lib-debug\Profile136\ + ..\..\obj\lib-debug\Profile136\ + false + full + true + prompt + 4 + + AllRules.ruleset + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + True + True + Resources.resx + + + + + + + + \ No newline at end of file diff --git a/src/Numerics/Portable.csproj b/src/Numerics/Numerics-Portable47.csproj similarity index 71% rename from src/Numerics/Portable.csproj rename to src/Numerics/Numerics-Portable47.csproj index 513c04fa..9bee2e76 100644 --- a/src/Numerics/Portable.csproj +++ b/src/Numerics/Numerics-Portable47.csproj @@ -11,26 +11,16 @@ MathNet.Numerics MathNet.Numerics v4.0 + Profile47 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - Profile47 - TRACE;DEBUG;PORTABLE - ..\..\out\debug\Portable47\ - false - full - true - prompt - 4 - - AllRules.ruleset - - - Profile47 + TRACE;PORTABLE - ..\..\out\lib\Portable47\ - ..\..\out\lib\Portable47\MathNet.Numerics.XML + ..\..\out\lib\Profile47\ + ..\..\obj\lib\Profile47\ + ..\..\obj\lib\Profile47\ + ..\..\out\lib\Profile47\MathNet.Numerics.XML true pdbonly prompt @@ -38,21 +28,20 @@ AllRules.ruleset 1591 - - Profile136 - TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\lib\Portable136\ - ..\..\out\lib\Portable136\MathNet.Numerics.XML - true - pdbonly - AnyCPU + + TRACE;DEBUG;PORTABLE + ..\..\out\lib-debug\Profile47\ + ..\..\obj\lib-debug\Profile47\ + ..\..\obj\lib-debug\Profile47\ + false + full + true prompt 4 + AllRules.ruleset - 1591 - PublicResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 383a230d..00054cff 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -12,9 +12,6 @@ MathNet.Numerics v4.0 512 - - - 3.5 false @@ -36,21 +33,10 @@ ..\MathNet.Numerics.snk false - - ..\..\out\debug\Net40\ - - false - true - full - false - TRACE;DEBUG;NATIVEMKL - prompt - 4 - - AllRules.ruleset - ..\..\out\lib\Net40\ + ..\..\obj\lib\Net40\ + ..\..\obj\lib\Net40\ ..\..\out\lib\Net40\MathNet.Numerics.xml false @@ -62,9 +48,26 @@ AllRules.ruleset 1591 + + ..\..\out\lib-debug\Net40\ + ..\..\obj\lib-debug\Net40\ + ..\..\obj\lib-debug\Net40\ + + false + true + full + false + TRACE;DEBUG;NATIVEMKL + prompt + 4 + + AllRules.ruleset + - ..\..\out\signed\Net40\ - ..\..\out\signed\Net40\MathNet.Numerics.xml + ..\..\out\lib-signed\Net40\ + ..\..\obj\lib-signed\Net40\ + ..\..\obj\lib-signed\Net40\ + ..\..\out\lib-signed\Net40\MathNet.Numerics.xml true pdbonly @@ -78,9 +81,7 @@ - - 3.5 - + @@ -438,38 +439,5 @@ Designer - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - \ No newline at end of file diff --git a/src/UnitTests/App.config b/src/UnitTests/App.config index 922f5d7f..4db4e57f 100644 --- a/src/UnitTests/App.config +++ b/src/UnitTests/App.config @@ -1,7 +1,7 @@ - + - +
@@ -12,4 +12,13 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/src/UnitTests/Properties/Settings.Designer.cs b/src/UnitTests/Properties/Settings.Designer.cs index 6279ddcc..9df4ec48 100644 --- a/src/UnitTests/Properties/Settings.Designer.cs +++ b/src/UnitTests/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18051 +// Runtime Version:4.0.30319.34003 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace MathNet.Numerics.UnitTests.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/UnitTests/UnitTests-Portable136.csproj b/src/UnitTests/UnitTests-Portable136.csproj new file mode 100644 index 00000000..9f0b454e --- /dev/null +++ b/src/UnitTests/UnitTests-Portable136.csproj @@ -0,0 +1,349 @@ + + + + 10.0 + Debug + AnyCPU + 8.0.30703 + 2.0 + {104E9129-FDC3-43CF-8687-9774C6D8C6C2} + Library + Properties + MathNet.Numerics.UnitTests + MathNet.Numerics.UnitTests136 + v4.5 + 512 + + + TRACE;PORTABLE;NOSYSNUMERICS + ..\..\out\test\Profile136\ + ..\..\obj\test\Profile136\ + ..\..\obj\test\Profile136\ + true + pdbonly + prompt + MinimumRecommendedRules.ruleset + 1591 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS + ..\..\out\test-debug\Profile136\ + ..\..\obj\test-debug\Profile136\ + ..\..\obj\test-debug\Profile136\ + false + full + true + prompt + 4 + 1591 + + + + + + + + + + + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + + {c2581199-28c4-41aa-a26a-f0c076ea2a67} + Numerics-Portable136 + + + + + + + True + True + Settings.settings + + + + + data\Codeplex-5667.csv + Always + + + data\Github-Cureos-1.csv + Always + + + data\Matlab\A.mat + Always + + + data\Matlab\collection-nocompress.mat + Always + + + data\Matlab\collection.mat + Always + + + data\Matlab\complex.mat + Always + + + data\Matlab\sparse-large.mat + Always + + + data\Matlab\sparse-small.mat + Always + + + data\Matlab\sparse_complex.mat + Always + + + data\Matlab\v.mat + Always + + + data\NIST\AtmWtAgt.dat + Always + + + data\NIST\Bennett5.dat + Always + + + data\NIST\BoxBOD.dat + Always + + + data\NIST\Chwirut1.dat + Always + + + data\NIST\Chwirut2.dat + Always + + + data\NIST\DanWood.dat + Always + + + data\NIST\Eckerle4.dat + Always + + + data\NIST\ENSO.dat + Always + + + data\NIST\Filip.dat + Always + + + data\NIST\Gauss1.dat + Always + + + data\NIST\Gauss2.dat + Always + + + data\NIST\Gauss3.dat + Always + + + data\NIST\Hahn1.dat + Always + + + data\NIST\Kirby2.dat + Always + + + data\NIST\Lanczos1.dat + Always + + + data\NIST\Lanczos2.dat + Always + + + data\NIST\Lanczos3.dat + Always + + + data\NIST\Lew.dat + Always + + + data\NIST\Longley.dat + Always + + + data\NIST\Lottery.dat + Always + + + data\NIST\Mavro.dat + Always + + + data\NIST\MGH09.dat + Always + + + data\NIST\MGH10.dat + Always + + + data\NIST\MGH17.dat + Always + + + data\NIST\Michelso.dat + Always + + + data\NIST\Misra1a.dat + Always + + + data\NIST\Misra1b.dat + Always + + + data\NIST\Misra1c.dat + Always + + + data\NIST\Misra1d.dat + Always + + + data\NIST\Nelson.dat + Always + + + data\NIST\NoInt1.dat + Always + + + data\NIST\NoInt2.dat + Always + + + data\NIST\Norris.dat + Always + + + data\NIST\NumAcc1.dat + Always + + + data\NIST\NumAcc2.dat + Always + + + data\NIST\NumAcc3.dat + Always + + + data\NIST\NumAcc4.dat + Always + + + data\NIST\Pontius.dat + Always + + + data\NIST\Rat42.dat + Always + + + data\NIST\Rat43.dat + Always + + + data\NIST\Roszman1.dat + Always + + + data\NIST\SiRstvt.dat + Always + + + data\NIST\SmLs01t.dat + Always + + + data\NIST\SmLs02t.dat + Always + + + data\NIST\SmLs03t.dat + Always + + + data\NIST\SmLs04t.dat + Always + + + data\NIST\SmLs05t.dat + Always + + + data\NIST\SmLs06t.dat + Always + + + data\NIST\SmLs07t.dat + Always + + + data\NIST\SmLs08t.dat + Always + + + data\NIST\SmLs09t.dat + Always + + + data\NIST\Thurber.dat + Always + + + data\NIST\Wampler1.dat + Always + + + data\NIST\Wampler2.dat + Always + + + data\NIST\Wampler3.dat + Always + + + data\NIST\Wampler4.dat + Always + + + data\NIST\Wampler5.dat + Always + + + + data\NIST\Meixner.dat + Always + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + \ No newline at end of file diff --git a/src/UnitTests/UnitTestsPortable.csproj b/src/UnitTests/UnitTests-Portable47.csproj similarity index 91% rename from src/UnitTests/UnitTestsPortable.csproj rename to src/UnitTests/UnitTests-Portable47.csproj index 1099c626..4e64a57f 100644 --- a/src/UnitTests/UnitTestsPortable.csproj +++ b/src/UnitTests/UnitTests-Portable47.csproj @@ -10,55 +10,35 @@ Library Properties MathNet.Numerics.UnitTests - MathNet.Numerics.UnitTests + MathNet.Numerics.UnitTests47 v4.5 512 - - TRACE;DEBUG;PORTABLE - ..\..\out\test\debug\Portable47\ - false - full - true - prompt - 4 - 1591 - - + TRACE;PORTABLE - ..\..\out\test\Portable47\ - ..\..\out\test\Portable47\MathNet.Numerics.XML + ..\..\out\test\Profile47\ + ..\..\obj\test\Profile47\ + ..\..\obj\test\Profile47\ true pdbonly prompt MinimumRecommendedRules.ruleset 1591 - - TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\test\Portable136\ - ..\..\out\test\Portable136\MathNet.Numerics.XML - true - pdbonly - AnyCPU + + TRACE;DEBUG;PORTABLE + ..\..\out\test-debug\Profile47\ + ..\..\obj\test-debug\Profile47\ + ..\..\obj\test-debug\Profile47\ + false + full + true prompt - MinimumRecommendedRules.ruleset + 4 1591 - - - - - True - True - Settings.settings - - - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - @@ -67,13 +47,25 @@ - - - + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + {49205185-621e-ffb9-2104-887c9f1bbd13} - Portable + Numerics-Portable47 + + + + + True + True + Settings.settings + + data\Codeplex-5667.csv diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 98389a9e..271014d2 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -10,27 +10,17 @@ Properties MathNet.Numerics.UnitTests MathNet.Numerics.UnitTests - v4.0 + v4.5 512 ..\MathNet.Numerics.snk false - - - DEBUG;TRACE - ..\..\out\test\debug\Net40\ - - false - true - full - false - prompt - 4 - AnyCPU - 1591 + ..\..\out\test\Net40\ + ..\..\obj\test\Net40\ + ..\..\obj\test\Net40\ false pdbonly @@ -40,9 +30,28 @@ 4 AllRules.ruleset 1591 + false + + + DEBUG;TRACE + ..\..\out\test-debug\Net40\ + ..\..\obj\test-debug\Net40\ + ..\..\obj\test-debug\Net40\ + + false + true + full + false + prompt + 4 + AnyCPU + 1591 + false - ..\..\out\test\signed\Net40\ + ..\..\out\test-signed\Net40\ + ..\..\obj\test-signed\Net40\ + ..\..\obj\test-signed\Net40\ true pdbonly @@ -52,11 +61,9 @@ 4 AllRules.ruleset 1591 + false - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - @@ -65,6 +72,15 @@ + + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False + True + + + {B7CAE5F4-A23F-4438-B5BE-41226618B695} + Numerics + @@ -385,12 +401,6 @@ - - - {B7CAE5F4-A23F-4438-B5BE-41226618B695} - Numerics - - data\Codeplex-5667.csv diff --git a/src/UnitTests/packages.config b/src/UnitTests/packages.config index 5c3ca54d..ad37a528 100644 --- a/src/UnitTests/packages.config +++ b/src/UnitTests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file