Browse Source

random generator now based on pcg-random

Syping 6 months ago
parent
commit
2d62bbb97e
6 changed files with 405 additions and 5 deletions
  1. 6
    4
      ProfileInterface.cpp
  2. 1
    0
      SnapmaticPicture.cpp
  3. 3
    1
      gta5view.pro
  4. 201
    0
      pcg/LICENSE.txt
  5. 116
    0
      pcg/pcg_basic.c
  6. 78
    0
      pcg/pcg_basic.h

+ 6
- 4
ProfileInterface.cpp View File

@@ -29,6 +29,7 @@
29 29
 #include "ProfileLoader.h"
30 30
 #include "ExportThread.h"
31 31
 #include "ImportDialog.h"
32
+#include "pcg_basic.h"
32 33
 #include "AppEnv.h"
33 34
 #include "config.h"
34 35
 #include <QProgressDialog>
@@ -1945,8 +1946,9 @@ preSelectionTitle:
1945 1946
 
1946 1947
 int ProfileInterface::getRandomUid()
1947 1948
 {
1948
-    std::mt19937 rng;
1949
-    rng.seed(std::random_device()());
1950
-    std::uniform_int_distribution<std::mt19937::result_type> uiddist(10000000, 2147483647);
1951
-    return uiddist(rng);
1949
+    pcg32_random_t rng;
1950
+    pcg32_srandom_r(&rng, time(NULL), (intptr_t)&rng);
1951
+    int random_int = pcg32_boundedrand_r(&rng, 2147483647);
1952
+    qDebug() << random_int;
1953
+    return random_int;
1952 1954
 }

+ 1
- 0
SnapmaticPicture.cpp View File

@@ -189,6 +189,7 @@ bool SnapmaticPicture::preloadFile()
189 189
                             rawPicContent = qUncompress(g5eContent);
190 190
 
191 191
                             // Setting is values
192
+                            isModernFormat = false;
192 193
                             isLoadedInRAM = true;
193 194
                         }
194 195
                         else

+ 3
- 1
gta5view.pro View File

@@ -64,6 +64,7 @@ SOURCES += main.cpp \
64 64
     TranslationClass.cpp \
65 65
     UserInterface.cpp \
66 66
     anpro/JSHighlighter.cpp \
67
+    pcg/pcg_basic.c \
67 68
     tmext/TelemetryClassAuthenticator.cpp \
68 69
     uimod/UiModLabel.cpp \
69 70
     uimod/UiModWidget.cpp
@@ -104,6 +105,7 @@ HEADERS  += \
104 105
     TranslationClass.h \
105 106
     UserInterface.h \
106 107
     anpro/JSHighlighter.h \
108
+    pcg/pcg_basic.h \
107 109
     tmext/TelemetryClassAuthenticator.h \
108 110
     uimod/UiModLabel.h \
109 111
     uimod/UiModWidget.h
@@ -148,7 +150,7 @@ DISTFILES += res/app.rc \
148 150
     res/gta5view.png \
149 151
     lang/README.txt
150 152
 
151
-INCLUDEPATH += ./anpro ./tmext ./uimod
153
+INCLUDEPATH += ./anpro ./pcg ./tmext ./uimod
152 154
 
153 155
 # GTA5SYNC/GTA5VIEW ONLY
154 156
 

+ 201
- 0
pcg/LICENSE.txt View File

@@ -0,0 +1,201 @@
1
+                                 Apache License
2
+                           Version 2.0, January 2004
3
+                        http://www.apache.org/licenses/
4
+
5
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+   1. Definitions.
8
+
9
+      "License" shall mean the terms and conditions for use, reproduction,
10
+      and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+      "Licensor" shall mean the copyright owner or entity authorized by
13
+      the copyright owner that is granting the License.
14
+
15
+      "Legal Entity" shall mean the union of the acting entity and all
16
+      other entities that control, are controlled by, or are under common
17
+      control with that entity. For the purposes of this definition,
18
+      "control" means (i) the power, direct or indirect, to cause the
19
+      direction or management of such entity, whether by contract or
20
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+      outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+      "You" (or "Your") shall mean an individual or Legal Entity
24
+      exercising permissions granted by this License.
25
+
26
+      "Source" form shall mean the preferred form for making modifications,
27
+      including but not limited to software source code, documentation
28
+      source, and configuration files.
29
+
30
+      "Object" form shall mean any form resulting from mechanical
31
+      transformation or translation of a Source form, including but
32
+      not limited to compiled object code, generated documentation,
33
+      and conversions to other media types.
34
+
35
+      "Work" shall mean the work of authorship, whether in Source or
36
+      Object form, made available under the License, as indicated by a
37
+      copyright notice that is included in or attached to the work
38
+      (an example is provided in the Appendix below).
39
+
40
+      "Derivative Works" shall mean any work, whether in Source or Object
41
+      form, that is based on (or derived from) the Work and for which the
42
+      editorial revisions, annotations, elaborations, or other modifications
43
+      represent, as a whole, an original work of authorship. For the purposes
44
+      of this License, Derivative Works shall not include works that remain
45
+      separable from, or merely link (or bind by name) to the interfaces of,
46
+      the Work and Derivative Works thereof.
47
+
48
+      "Contribution" shall mean any work of authorship, including
49
+      the original version of the Work and any modifications or additions
50
+      to that Work or Derivative Works thereof, that is intentionally
51
+      submitted to Licensor for inclusion in the Work by the copyright owner
52
+      or by an individual or Legal Entity authorized to submit on behalf of
53
+      the copyright owner. For the purposes of this definition, "submitted"
54
+      means any form of electronic, verbal, or written communication sent
55
+      to the Licensor or its representatives, including but not limited to
56
+      communication on electronic mailing lists, source code control systems,
57
+      and issue tracking systems that are managed by, or on behalf of, the
58
+      Licensor for the purpose of discussing and improving the Work, but
59
+      excluding communication that is conspicuously marked or otherwise
60
+      designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+      "Contributor" shall mean Licensor and any individual or Legal Entity
63
+      on behalf of whom a Contribution has been received by Licensor and
64
+      subsequently incorporated within the Work.
65
+
66
+   2. Grant of Copyright License. Subject to the terms and conditions of
67
+      this License, each Contributor hereby grants to You a perpetual,
68
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+      copyright license to reproduce, prepare Derivative Works of,
70
+      publicly display, publicly perform, sublicense, and distribute the
71
+      Work and such Derivative Works in Source or Object form.
72
+
73
+   3. Grant of Patent License. Subject to the terms and conditions of
74
+      this License, each Contributor hereby grants to You a perpetual,
75
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+      (except as stated in this section) patent license to make, have made,
77
+      use, offer to sell, sell, import, and otherwise transfer the Work,
78
+      where such license applies only to those patent claims licensable
79
+      by such Contributor that are necessarily infringed by their
80
+      Contribution(s) alone or by combination of their Contribution(s)
81
+      with the Work to which such Contribution(s) was submitted. If You
82
+      institute patent litigation against any entity (including a
83
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+      or a Contribution incorporated within the Work constitutes direct
85
+      or contributory patent infringement, then any patent licenses
86
+      granted to You under this License for that Work shall terminate
87
+      as of the date such litigation is filed.
88
+
89
+   4. Redistribution. You may reproduce and distribute copies of the
90
+      Work or Derivative Works thereof in any medium, with or without
91
+      modifications, and in Source or Object form, provided that You
92
+      meet the following conditions:
93
+
94
+      (a) You must give any other recipients of the Work or
95
+          Derivative Works a copy of this License; and
96
+
97
+      (b) You must cause any modified files to carry prominent notices
98
+          stating that You changed the files; and
99
+
100
+      (c) You must retain, in the Source form of any Derivative Works
101
+          that You distribute, all copyright, patent, trademark, and
102
+          attribution notices from the Source form of the Work,
103
+          excluding those notices that do not pertain to any part of
104
+          the Derivative Works; and
105
+
106
+      (d) If the Work includes a "NOTICE" text file as part of its
107
+          distribution, then any Derivative Works that You distribute must
108
+          include a readable copy of the attribution notices contained
109
+          within such NOTICE file, excluding those notices that do not
110
+          pertain to any part of the Derivative Works, in at least one
111
+          of the following places: within a NOTICE text file distributed
112
+          as part of the Derivative Works; within the Source form or
113
+          documentation, if provided along with the Derivative Works; or,
114
+          within a display generated by the Derivative Works, if and
115
+          wherever such third-party notices normally appear. The contents
116
+          of the NOTICE file are for informational purposes only and
117
+          do not modify the License. You may add Your own attribution
118
+          notices within Derivative Works that You distribute, alongside
119
+          or as an addendum to the NOTICE text from the Work, provided
120
+          that such additional attribution notices cannot be construed
121
+          as modifying the License.
122
+
123
+      You may add Your own copyright statement to Your modifications and
124
+      may provide additional or different license terms and conditions
125
+      for use, reproduction, or distribution of Your modifications, or
126
+      for any such Derivative Works as a whole, provided Your use,
127
+      reproduction, and distribution of the Work otherwise complies with
128
+      the conditions stated in this License.
129
+
130
+   5. Submission of Contributions. Unless You explicitly state otherwise,
131
+      any Contribution intentionally submitted for inclusion in the Work
132
+      by You to the Licensor shall be under the terms and conditions of
133
+      this License, without any additional terms or conditions.
134
+      Notwithstanding the above, nothing herein shall supersede or modify
135
+      the terms of any separate license agreement you may have executed
136
+      with Licensor regarding such Contributions.
137
+
138
+   6. Trademarks. This License does not grant permission to use the trade
139
+      names, trademarks, service marks, or product names of the Licensor,
140
+      except as required for reasonable and customary use in describing the
141
+      origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+   7. Disclaimer of Warranty. Unless required by applicable law or
144
+      agreed to in writing, Licensor provides the Work (and each
145
+      Contributor provides its Contributions) on an "AS IS" BASIS,
146
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+      implied, including, without limitation, any warranties or conditions
148
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+      PARTICULAR PURPOSE. You are solely responsible for determining the
150
+      appropriateness of using or redistributing the Work and assume any
151
+      risks associated with Your exercise of permissions under this License.
152
+
153
+   8. Limitation of Liability. In no event and under no legal theory,
154
+      whether in tort (including negligence), contract, or otherwise,
155
+      unless required by applicable law (such as deliberate and grossly
156
+      negligent acts) or agreed to in writing, shall any Contributor be
157
+      liable to You for damages, including any direct, indirect, special,
158
+      incidental, or consequential damages of any character arising as a
159
+      result of this License or out of the use or inability to use the
160
+      Work (including but not limited to damages for loss of goodwill,
161
+      work stoppage, computer failure or malfunction, or any and all
162
+      other commercial damages or losses), even if such Contributor
163
+      has been advised of the possibility of such damages.
164
+
165
+   9. Accepting Warranty or Additional Liability. While redistributing
166
+      the Work or Derivative Works thereof, You may choose to offer,
167
+      and charge a fee for, acceptance of support, warranty, indemnity,
168
+      or other liability obligations and/or rights consistent with this
169
+      License. However, in accepting such obligations, You may act only
170
+      on Your own behalf and on Your sole responsibility, not on behalf
171
+      of any other Contributor, and only if You agree to indemnify,
172
+      defend, and hold each Contributor harmless for any liability
173
+      incurred by, or claims asserted against, such Contributor by reason
174
+      of your accepting any such warranty or additional liability.
175
+
176
+   END OF TERMS AND CONDITIONS
177
+
178
+   APPENDIX: How to apply the Apache License to your work.
179
+
180
+      To apply the Apache License to your work, attach the following
181
+      boilerplate notice, with the fields enclosed by brackets "{}"
182
+      replaced with your own identifying information. (Don't include
183
+      the brackets!)  The text should be enclosed in the appropriate
184
+      comment syntax for the file format. We also recommend that a
185
+      file or class name and description of purpose be included on the
186
+      same "printed page" as the copyright notice for easier
187
+      identification within third-party archives.
188
+
189
+   Copyright {yyyy} {name of copyright owner}
190
+
191
+   Licensed under the Apache License, Version 2.0 (the "License");
192
+   you may not use this file except in compliance with the License.
193
+   You may obtain a copy of the License at
194
+
195
+       http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+   Unless required by applicable law or agreed to in writing, software
198
+   distributed under the License is distributed on an "AS IS" BASIS,
199
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+   See the License for the specific language governing permissions and
201
+   limitations under the License.

+ 116
- 0
pcg/pcg_basic.c View File

@@ -0,0 +1,116 @@
1
+/*
2
+ * PCG Random Number Generation for C.
3
+ *
4
+ * Copyright 2014 Melissa O'Neill <oneill@pcg-random.org>
5
+ *
6
+ * Licensed under the Apache License, Version 2.0 (the "License");
7
+ * you may not use this file except in compliance with the License.
8
+ * You may obtain a copy of the License at
9
+ *
10
+ *     http://www.apache.org/licenses/LICENSE-2.0
11
+ *
12
+ * Unless required by applicable law or agreed to in writing, software
13
+ * distributed under the License is distributed on an "AS IS" BASIS,
14
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ * See the License for the specific language governing permissions and
16
+ * limitations under the License.
17
+ *
18
+ * For additional information about the PCG random number generation scheme,
19
+ * including its license and other licensing options, visit
20
+ *
21
+ *       http://www.pcg-random.org
22
+ */
23
+
24
+/*
25
+ * This code is derived from the full C implementation, which is in turn
26
+ * derived from the canonical C++ PCG implementation. The C++ version
27
+ * has many additional features and is preferable if you can use C++ in
28
+ * your project.
29
+ */
30
+
31
+#include "pcg_basic.h"
32
+
33
+// state for global RNGs
34
+
35
+static pcg32_random_t pcg32_global = PCG32_INITIALIZER;
36
+
37
+// pcg32_srandom(initstate, initseq)
38
+// pcg32_srandom_r(rng, initstate, initseq):
39
+//     Seed the rng.  Specified in two parts, state initializer and a
40
+//     sequence selection constant (a.k.a. stream id)
41
+
42
+void pcg32_srandom_r(pcg32_random_t* rng, uint64_t initstate, uint64_t initseq)
43
+{
44
+    rng->state = 0U;
45
+    rng->inc = (initseq << 1u) | 1u;
46
+    pcg32_random_r(rng);
47
+    rng->state += initstate;
48
+    pcg32_random_r(rng);
49
+}
50
+
51
+void pcg32_srandom(uint64_t seed, uint64_t seq)
52
+{
53
+    pcg32_srandom_r(&pcg32_global, seed, seq);
54
+}
55
+
56
+// pcg32_random()
57
+// pcg32_random_r(rng)
58
+//     Generate a uniformly distributed 32-bit random number
59
+
60
+uint32_t pcg32_random_r(pcg32_random_t* rng)
61
+{
62
+    uint64_t oldstate = rng->state;
63
+    rng->state = oldstate * 6364136223846793005ULL + rng->inc;
64
+    uint32_t xorshifted = ((oldstate >> 18u) ^ oldstate) >> 27u;
65
+    uint32_t rot = oldstate >> 59u;
66
+    return (xorshifted >> rot) | (xorshifted << ((-rot) & 31));
67
+}
68
+
69
+uint32_t pcg32_random()
70
+{
71
+    return pcg32_random_r(&pcg32_global);
72
+}
73
+
74
+
75
+// pcg32_boundedrand(bound):
76
+// pcg32_boundedrand_r(rng, bound):
77
+//     Generate a uniformly distributed number, r, where 0 <= r < bound
78
+
79
+uint32_t pcg32_boundedrand_r(pcg32_random_t* rng, uint32_t bound)
80
+{
81
+    // To avoid bias, we need to make the range of the RNG a multiple of
82
+    // bound, which we do by dropping output less than a threshold.
83
+    // A naive scheme to calculate the threshold would be to do
84
+    //
85
+    //     uint32_t threshold = 0x100000000ull % bound;
86
+    //
87
+    // but 64-bit div/mod is slower than 32-bit div/mod (especially on
88
+    // 32-bit platforms).  In essence, we do
89
+    //
90
+    //     uint32_t threshold = (0x100000000ull-bound) % bound;
91
+    //
92
+    // because this version will calculate the same modulus, but the LHS
93
+    // value is less than 2^32.
94
+
95
+    uint32_t threshold = -bound % bound;
96
+
97
+    // Uniformity guarantees that this loop will terminate.  In practice, it
98
+    // should usually terminate quickly; on average (assuming all bounds are
99
+    // equally likely), 82.25% of the time, we can expect it to require just
100
+    // one iteration.  In the worst case, someone passes a bound of 2^31 + 1
101
+    // (i.e., 2147483649), which invalidates almost 50% of the range.  In 
102
+    // practice, bounds are typically small and only a tiny amount of the range
103
+    // is eliminated.
104
+    for (;;) {
105
+        uint32_t r = pcg32_random_r(rng);
106
+        if (r >= threshold)
107
+            return r % bound;
108
+    }
109
+}
110
+
111
+
112
+uint32_t pcg32_boundedrand(uint32_t bound)
113
+{
114
+    return pcg32_boundedrand_r(&pcg32_global, bound);
115
+}
116
+

+ 78
- 0
pcg/pcg_basic.h View File

@@ -0,0 +1,78 @@
1
+/*
2
+ * PCG Random Number Generation for C.
3
+ *
4
+ * Copyright 2014 Melissa O'Neill <oneill@pcg-random.org>
5
+ *
6
+ * Licensed under the Apache License, Version 2.0 (the "License");
7
+ * you may not use this file except in compliance with the License.
8
+ * You may obtain a copy of the License at
9
+ *
10
+ *     http://www.apache.org/licenses/LICENSE-2.0
11
+ *
12
+ * Unless required by applicable law or agreed to in writing, software
13
+ * distributed under the License is distributed on an "AS IS" BASIS,
14
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ * See the License for the specific language governing permissions and
16
+ * limitations under the License.
17
+ *
18
+ * For additional information about the PCG random number generation scheme,
19
+ * including its license and other licensing options, visit
20
+ *
21
+ *     http://www.pcg-random.org
22
+ */
23
+
24
+/*
25
+ * This code is derived from the full C implementation, which is in turn
26
+ * derived from the canonical C++ PCG implementation. The C++ version
27
+ * has many additional features and is preferable if you can use C++ in
28
+ * your project.
29
+ */
30
+
31
+#ifndef PCG_BASIC_H_INCLUDED
32
+#define PCG_BASIC_H_INCLUDED 1
33
+
34
+#include <inttypes.h>
35
+
36
+#if __cplusplus
37
+extern "C" {
38
+#endif
39
+
40
+struct pcg_state_setseq_64 {    // Internals are *Private*.
41
+    uint64_t state;             // RNG state.  All values are possible.
42
+    uint64_t inc;               // Controls which RNG sequence (stream) is
43
+                                // selected. Must *always* be odd.
44
+};
45
+typedef struct pcg_state_setseq_64 pcg32_random_t;
46
+
47
+// If you *must* statically initialize it, here's one.
48
+
49
+#define PCG32_INITIALIZER   { 0x853c49e6748fea9bULL, 0xda3e39cb94b95bdbULL }
50
+
51
+// pcg32_srandom(initstate, initseq)
52
+// pcg32_srandom_r(rng, initstate, initseq):
53
+//     Seed the rng.  Specified in two parts, state initializer and a
54
+//     sequence selection constant (a.k.a. stream id)
55
+
56
+void pcg32_srandom(uint64_t initstate, uint64_t initseq);
57
+void pcg32_srandom_r(pcg32_random_t* rng, uint64_t initstate,
58
+                     uint64_t initseq);
59
+
60
+// pcg32_random()
61
+// pcg32_random_r(rng)
62
+//     Generate a uniformly distributed 32-bit random number
63
+
64
+uint32_t pcg32_random(void);
65
+uint32_t pcg32_random_r(pcg32_random_t* rng);
66
+
67
+// pcg32_boundedrand(bound):
68
+// pcg32_boundedrand_r(rng, bound):
69
+//     Generate a uniformly distributed number, r, where 0 <= r < bound
70
+
71
+uint32_t pcg32_boundedrand(uint32_t bound);
72
+uint32_t pcg32_boundedrand_r(pcg32_random_t* rng, uint32_t bound);
73
+
74
+#if __cplusplus
75
+}
76
+#endif
77
+
78
+#endif // PCG_BASIC_H_INCLUDED