Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix prime number implementation. #55

Merged
merged 1 commit into from
Aug 21, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions QLNet/Math/PrimeNumbers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,17 @@ private PrimeNumbers() { }
public static ulong get(int absoluteIndex)
{
if (primeNumbers_.empty())
{
//int n = sizeof(firstPrimes)/sizeof(firstPrimes[0]);
int n = 8*sizeof(ulong)/sizeof(ulong);
//primeNumbers_.insert(primeNumbers_.end(),firstPrimes, firstPrimes+n);
//IEnumerable<ulong> colection=firstPrimes..ForEach((i, x) => i <n));
primeNumbers_.AddRange( firstPrimes.ToList<ulong>().GetRange(0,n));
}
while (primeNumbers_.Count<=absoluteIndex)
primeNumbers_.AddRange(firstPrimes);

while (primeNumbers_.Count<=absoluteIndex)
nextPrimeNumber();
return primeNumbers_[absoluteIndex];

return primeNumbers_[absoluteIndex];
}

private static ulong nextPrimeNumber()
{
//ulong p, n, m = primeNumbers_.back();
ulong p, n, m = primeNumbers_.First();
ulong p, n, m = primeNumbers_.Last();
do {
// skip the even numbers
m += 2;
Expand All @@ -80,12 +75,10 @@ private static ulong nextPrimeNumber()
p = primeNumbers_[i];
++i;
}
while ((m % p==1) && p <= n);//while ( m%p && p<=n );
while ((m % p != 0) && p <= n);
} while ( p<=n );
primeNumbers_.Add(m);
return m;
}

}

}