Browse Source

Data: minor project cleanup

uap-experimental
Christoph Ruegg 7 years ago
parent
commit
515289935b
  1. 3
      src/Data.Tests/Data.Tests.csproj
  2. 3
      src/Data/Matlab/Matlab.csproj
  3. 4
      src/Data/Text/DelimitedReader.cs
  4. 3
      src/Data/Text/Text.csproj

3
src/Data.Tests/Data.Tests.csproj

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<GenerateProgramFile>false</GenerateProgramFile> <GenerateProgramFile>false</GenerateProgramFile>
<TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks> <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>MathNet.Numerics.Data.Tests</AssemblyName> <AssemblyName>MathNet.Numerics.Data.Tests</AssemblyName>
<RootNamespace>MathNet.Numerics.Data.Tests</RootNamespace> <RootNamespace>MathNet.Numerics.Data.Tests</RootNamespace>
@ -17,7 +17,6 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Content Include="app.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Data\Matlab\Matlab.csproj" /> <ProjectReference Include="..\Data\Matlab\Matlab.csproj" />

3
src/Data/Matlab/Matlab.csproj

@ -33,8 +33,5 @@ In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0.</P
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" /> <Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project> </Project>

4
src/Data/Text/DelimitedReader.cs

@ -82,7 +82,7 @@ namespace MathNet.Numerics.Data.Text
var regex = delimiter == @"\s" ? var regex = delimiter == @"\s" ?
RegexCache.GetOrAdd(delimiter, d => new Regex(WhiteSpaceRegexTemplate, RegexOptions.Compiled)) : RegexCache.GetOrAdd(delimiter, d => new Regex(WhiteSpaceRegexTemplate, RegexOptions.Compiled)) :
RegexCache.GetOrAdd(delimiter, d => new Regex(string.Format(RegexTemplate, d), RegexOptions.Compiled)); RegexCache.GetOrAdd(delimiter, d => new Regex(string.Format(RegexTemplate, d), RegexOptions.Compiled));
var parse = CreateParser<T>(formatProvider); var parse = CreateParser<T>(formatProvider);
var data = new List<T[]>(); var data = new List<T[]>();
@ -305,7 +305,7 @@ namespace MathNet.Numerics.Data.Text
return delimiter; return delimiter;
} }
} }
/// <summary> /// <summary>
/// strip off quotes (TODO: can we replace this with trimming?) /// strip off quotes (TODO: can we replace this with trimming?)
/// </summary> /// </summary>

3
src/Data/Text/Text.csproj

@ -33,8 +33,5 @@ In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0.</P
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" /> <Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project> </Project>
Loading…
Cancel
Save