[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators. URL: https://github.com/apache/commons-rng/pull/56#discussion_r305746352 ## File path: commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java ## @@ -48,7 +50,7 @@ import org.apache.commons.rng.core.source64.XoShiRo256StarStar; import org.apache.commons.rng.core.source64.XoShiRo512Plus; import org.apache.commons.rng.core.source64.XoShiRo512StarStar; - Review comment: Sir, could you elaborate on that change ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators. URL: https://github.com/apache/commons-rng/pull/56#discussion_r305746292 ## File path: commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/PcgXshRr32.java ## @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.rng.core.source32; + +/** + * XSH-RR: An xorshift mixes some high-order bits down, Review comment: Done. Kindly check. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305746408
##
File path:
commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/PcgXshRr32Test.java
##
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.rng.core.source32;
+
+import org.apache.commons.rng.core.RandomAssert;
+import org.junit.Test;
+
+public class PcgXshRr32Test {
+@Test
+/*
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators. URL: https://github.com/apache/commons-rng/pull/56#discussion_r305746064 ## File path: commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/PcgXshRs32.java ## @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.rng.core.source32; + +/** + * XSH RS -- high xorshift, followed by a random shift. + * State size is 64 bits and the period is 264. + * @see http://www.pcg-random.org/;> Review comment: Solved. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305745924
##
File path:
commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/PcgRxsMXs64.java
##
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rng.core.source64;
+
+import org.apache.commons.rng.core.util.NumberFactory;
+/**
+ * RXS M XS -- random xorshift, mcg multiply, fixed xorshift.
+ * State size is 64 bits and the period is 264.
+ * @see http://www.pcg-random.org/;>
+ * PCG, A Family of Better Random Number Generators
+ * @since 1.3
+ */
+public class PcgRxsMXs64 extends LongProvider {
+
+/** Size of the state array. */
+private static final int SEED_SIZE = 2;
+
+/** Displays the current state. */
+private long state;
+
+/** Used as a part of the LCG. */
+private long increment;
+
+/**
+ * Creates a new instance.
+ *
+ * @param seed Initial seed.
+ * If the length is larger than 2, only the first 2 elements will
+ * be used; if smaller, the remaining elements will be automatically set.
+ */
+public PcgRxsMXs64(long[] seed) {
+if (seed.length < SEED_SIZE) {
+final long[] tmp = new long[SEED_SIZE];
+fillState(tmp, seed);
+setSeedInternal(tmp);
+} else {
+setSeedInternal(seed);
+}
+}
+
+/**
+ * Modifies input parameters into current state.
+ * @param seed the new seed.
+ */
+private void setSeedInternal(long[] seed) {
+this.increment = (seed[1] << 1) | 1;
+this.state = bump(seed[0] + this.increment);
+}
+
+/**
+ * Provides the next state of the LCG.
+ * @param input - The previous state of the generator.
+ * @return Next state of the LCG.
+ */
+private long bump(long input) {
+return input * 6364136223846793005L + increment;
+}
+
+/** {@inheritDoc} */
+@Override
+public long next() {
+final long x = state;
+state = bump(state);
+final long word = ((x >>> ((x >>> 59) + 5)) ^ x) *
-5840758589994634535L;
+return (word >>> 43) ^ word;
+}
+
+/** {@inheritDoc} */
+@Override
+protected byte[] getStateInternal() {
+return composeStateInternal(NumberFactory.makeByteArray(
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305745830
##
File path:
commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/PcgRxsMXs64Test.java
##
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.rng.core.source64;
+
+import org.apache.commons.rng.core.RandomAssert;
+import org.junit.Test;
+
+public class PcgRxsMXs64Test {
+@Test
+/*
+ * Tested with respect to pcg_engines::setseq_rxs_m_xs_64_64 of the C++
implementation.
+ * See : http://www.pcg-random.org/download.html#cpp-implementation
+ */
+public void testReferenceCode() {
+final long[] expectedSequence = {
+0xc147f2291fa40ccfL, 0x8edbcbf8a5f49877L, 0x61e05a1d5213f0b4L,
0xc039f9369032e638L,
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305745069
##
File path:
commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/AbstractPcg6432.java
##
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rng.core.source32;
+
+import org.apache.commons.rng.core.util.NumberFactory;
+/**
+ * This class aids in implementation of the PCG suite of generators, a family
of
+ * simple fast space-efficient statistically good algorithms for random number
generation.
+ * @see http://www.pcg-random.org/;>
+ * PCG, A Family of Better Random Number Generators
+ * @since 1.3
+ */
+abstract class AbstractPcg6432 extends IntProvider {
+/** Size of the state array. */
+private static final int SEED_SIZE = 2;
+
+/** Displays the current state. */
+private long state;
+
+/** Used as a part of the LCG. */
+private long increment;
+
+/**
+ * Creates a new instance.
+ *
+ * @param seed Initial seed.
+ * If the length is larger than 2, only the first 2 elements will
+ * be used; if smaller, the remaining elements will be automatically set.
+ */
+AbstractPcg6432(long[] seed) {
+if (seed.length < SEED_SIZE) {
+final long[] tmp = new long[SEED_SIZE];
+fillState(tmp, seed);
+setSeedInternal(tmp);
+} else {
+setSeedInternal(seed);
+}
+}
+
+/**
+ * Modifies input parameters into current state.
+ * @param seed the new seed.
+ */
+private void setSeedInternal(long[] seed) {
+this.increment = (seed[1] << 1) | 1;
+this.state = bump(seed[0] + this.increment);
+}
+
+/**
+ * Provides the next state of the LCG.
+ * @param input - The previous state of the generator.
+ * @return Next state of the LCG.
+ */
+private long bump(long input) {
+return input * 6364136223846793005L + increment;
+}
+
+/** {@inheritDoc} */
+@Override
+public int next() {
+final long x = state;
+state = bump(state);
+return transform(x);
+}
+
+/**
+ * The transformation function shall vary with respect to different
generators.
+ * @param x The input.
+ * @return The output of the generator.
+ */
+protected abstract int transform(long x);
+
+/** {@inheritDoc} */
+@Override
+protected byte[] getStateInternal() {
+return composeStateInternal(NumberFactory.makeByteArray(
+new long[] {state, increment >>> 1}),
+super.getStateInternal());
+}
+
+/** {@inheritDoc} */
+@Override
+protected void setStateInternal(byte[] s) {
+final byte[][] c = splitStateInternal(s, SEED_SIZE * 8);
+long[] tempseed;
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305744916
##
File path:
commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
##
@@ -109,6 +114,7 @@
add(LIST64, new XoShiRo256StarStar(new long[] {g.nextLong(),
g.nextLong(), g.nextLong(), g.nextLong()}));
add(LIST64, new XoShiRo512Plus(new long[] {g.nextLong(),
g.nextLong(), g.nextLong(), g.nextLong()}));
add(LIST64, new XoShiRo512StarStar(new long[] {g.nextLong(),
g.nextLong(), g.nextLong(), g.nextLong()}));
+add(LIST64, new PcgRxsMXs64(new long[] {g.nextLong(),
g.nextLong()}));
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305744974
##
File path:
commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/PcgXshRs32.java
##
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rng.core.source32;
+
+/**
+ * XSH RS -- high xorshift, followed by a random shift.
+ * State size is 64 bits and the period is 264.
+ * @see http://www.pcg-random.org/;>
+ * PCG, A Family of Better Random Number Generators
+ * @since 1.3
+ */
+public class PcgXshRs32 extends AbstractPcg6432 {
+/**
+ * Creates an instance with the given {@code seed}.
+ * @param seed Initial seed.
+ */
+public PcgXshRs32(long[]seed) {
Review comment:
Solved.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [commons-rng] AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added members of the PCG suite of generators.
AbhishekSinghDhadwal commented on a change in pull request #56: RNG: 84 - Added
members of the PCG suite of generators.
URL: https://github.com/apache/commons-rng/pull/56#discussion_r305744742
##
File path:
commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
##
@@ -94,6 +97,8 @@
add(LIST32, new XoRoShiRo64StarStar(new int[] {g.nextInt(),
g.nextInt(), g.nextInt()}));
add(LIST32, new XoShiRo128Plus(new int[] {g.nextInt(),
g.nextInt(), g.nextInt()}));
add(LIST32, new XoShiRo128StarStar(new int[] {g.nextInt(),
g.nextInt(), g.nextInt()}));
+add(LIST32, new PcgXshRr32(new long[] {g.nextLong(),
g.nextLong()}));
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
