File tree Expand file tree Collapse file tree 2 files changed +15
-28
lines changed Expand file tree Collapse file tree 2 files changed +15
-28
lines changed Original file line number Diff line number Diff line change 33using System . Collections . Generic ;
44using System . IO ;
55using System . Reflection ;
6- using System . Text ;
76
87namespace DataStructures . Common
98{
@@ -65,7 +64,8 @@ public static PrimesList Instance
6564 /// </summary>
6665 private static void _initializeData ( )
6766 {
68- string [ ] lines = _readResource ( "DataStructures.Data.PrimesDocument_10K.csv" ) ;
67+ _primesDocPath = Path . Combine ( Path . GetDirectoryName ( typeof ( PrimesList ) . GetTypeInfo ( ) . Assembly . Location ) , @"Data/PrimesDocument_10K.csv" ) ;
68+ string [ ] lines = File . ReadAllLines ( _primesDocPath ) ;
6969
7070 foreach ( var line in lines )
7171 {
@@ -84,28 +84,10 @@ private static void _initializeData()
8484 }
8585 }
8686
87- /// <summary>
88- /// Reads an embedded resource as a text file.
89- /// </summary>
90- /// <returns></returns>
91- public static string [ ] _readResource ( string resourceName )
92- {
93- try
94- {
95- using ( var stream = typeof ( PrimesList ) . GetTypeInfo ( ) . Assembly . GetManifestResourceStream ( resourceName ) )
96- using ( var reader = new StreamReader ( stream ?? throw new InvalidOperationException ( "Failed to read resource" ) , Encoding . UTF8 ) )
97- return reader . ReadToEnd ( ) . Split ( "\r \n " ) ;
98- }
99- catch ( Exception ex )
100- {
101- throw new Exception ( $ "Failed to read resource { resourceName } ", ex ) ;
102- }
103- }
104-
105- /// <summary>
106- /// Return count of primes.
107- /// </summary>
108- public int Count
87+ /// <summary>
88+ /// Return count of primes.
89+ /// </summary>
90+ public int Count
10991 {
11092 get { return _primes . Count ; }
11193 }
@@ -228,4 +210,5 @@ public void CopyTo(int[] array, int index = 0)
228210 }
229211
230212 }
213+
231214}
Original file line number Diff line number Diff line change 22 <PropertyGroup >
33 <TargetFramework >netcoreapp2.0</TargetFramework >
44 </PropertyGroup >
5+
56 <ItemGroup >
6- <None Remove =" Data\PrimesDocument_10K.csv" />
7+ <Content Include =" Data\PrimesDocument_10K.csv" >
8+ <CopyToOutputDirectory >Always</CopyToOutputDirectory >
9+ </Content >
710 </ItemGroup >
11+
812 <ItemGroup >
9- <EmbeddedResource Include =" Data\PrimesDocument_10K.csv" >
10- <CopyToOutputDirectory >Never </CopyToOutputDirectory >
11- </EmbeddedResource >
13+ <None Update =" Data\PrimesDocument_10K.csv" >
14+ <CopyToOutputDirectory >Always </CopyToOutputDirectory >
15+ </None >
1216 </ItemGroup >
1317</Project >
You can’t perform that action at this time.
0 commit comments