mg-pso-gui 0.1.126__tar.gz → 0.1.128__tar.gz

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.126
+Version: 0.1.128
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.126
+Version: 0.1.128
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/mg_pso_gui.egg-info/SOURCES.txt

@@ -53,8 +53,13 @@ mgpsogui/util/recosu/pso/csip_access.py
 mgpsogui/util/recosu/pso/pso.py
 mgpsogui/util/recosu/sampling/__init__.py
 mgpsogui/util/recosu/sampling/sample_trace_writer.py
-mgpsogui/util/recosu/sampling/sampler.py
 mgpsogui/util/recosu/sampling/sampler_task.py
+mgpsogui/util/recosu/sampling/sampling.py
+mgpsogui/util/recosu/sampling/halton/__init__.py
+mgpsogui/util/recosu/sampling/halton/halton.py
+mgpsogui/util/recosu/sampling/halton/prime.py
+mgpsogui/util/recosu/sampling/random/__init__.py
+mgpsogui/util/recosu/sampling/random/random_sampler.py
 mgpsogui/util/recosu/utils/__init__.py
 mgpsogui/util/recosu/utils/trace_writer.py
 mgpsogui/util/recosu/utils/utils.py

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/mgpsogui/util/PSORunner.py

@@ -5,7 +5,7 @@ from queue import Empty
 import threading
 import time
 import os
-from .recosu.sampling.sampler import run_sampler
+from .recosu.sampling.sampling import run_sampler
 
 #from cosu.pso import global_best
 from .recosu.pso import global_best

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/mgpsogui/util/recosu/__init__.py

@@ -6,5 +6,6 @@ __author__ = 'Olaf David'
 __email__ = 'odavid@colostate.edu'
 
 from .pso import pso
-__all__ = ["pso"]
+from .sampling import sampling
+__all__ = ["pso", "sampling"]
 

mg-pso-gui-0.1.128/mgpsogui/util/recosu/sampling/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+"""
+LUCA/PSO toolkit
+=========================================
+This is ...
+
+"""
+
+__author__ = """Olaf David"""
+__email__ = "odavid@colostate.edu"
+__version__ = "1.0"
+
+from .sampling import run_sampler
+
+__all__ = ["run_sampler"]

mg-pso-gui-0.1.128/mgpsogui/util/recosu/sampling/halton/halton.py

@@ -0,0 +1,45 @@
+from collections.abc import Iterable
+import math
+from recosu.sampling.halton.prime import generate_n_primes
+
+
+def halton(index: int, base: int) -> float:
+    fraction: float = 1.0
+    result: float = 0
+
+    while index > 0:
+        fraction = fraction / base
+        result += fraction * (index % base)
+        index = math.floor(index / base)
+
+    return result
+
+
+class HaltonSampleGenerator:
+    index: int
+    maxIndex: int
+    primes: list[int]
+
+    def __init__(self, count: int, offset: int, num_parameters: int):
+        assert (count > 0)
+        assert (offset >= 0)
+        self.index = offset + 1
+        self.maxIndex = offset + count + 1
+        self.primes = generate_n_primes(num_parameters)
+
+    def __iter__(self) -> Iterable[tuple[int, list[float]]]:
+        return self
+
+    def __next__(self) -> tuple[int, list[float]]:
+        if self.index >= self.maxIndex:
+            raise StopIteration
+
+        i = 0
+        values: list[float] = []
+        for base in self.primes:
+            values.append(halton(self.index, base))
+
+        result: tuple[int, list[float]] = (self.index, values)
+        self.index = self.index + 1
+        return result
+

mg-pso-gui-0.1.128/mgpsogui/util/recosu/sampling/halton/prime.py

@@ -0,0 +1,82 @@
+from typing import List
+
+PRIME_TABLE: List[int] = [
+    2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
+    31, 37, 41, 43, 47, 53, 59, 61, 67, 71,
+    73, 79, 83, 89, 97, 101, 103, 107, 109, 113,
+    127, 131, 137, 139, 149, 151, 157, 163, 167, 173,
+    179, 181, 191, 193, 197, 199, 211, 223, 227, 229,
+    233, 239, 241, 251, 257, 263, 269, 271, 277, 281,
+    283, 293, 307, 311, 313, 317, 331, 337, 347, 349,
+    353, 359, 367, 373, 379, 383, 389, 397, 401, 409,
+    419, 421, 431, 433, 439, 443, 449, 457, 461, 463,
+    467, 479, 487, 491, 499, 503, 509, 521, 523, 541,
+    547, 557, 563, 569, 571, 577, 587, 593, 599, 601,
+    607, 613, 617, 619, 631, 641, 643, 647, 653, 659,
+    661, 673, 677, 683, 691, 701, 709, 719, 727, 733,
+    739, 743, 751, 757, 761, 769, 773, 787, 797, 809,
+    811, 821, 823, 827, 829, 839, 853, 857, 859, 863,
+    877, 881, 883, 887, 907, 911, 919, 929, 937, 941,
+    947, 953, 967, 971, 977, 983, 991, 997, 1009, 1013,
+    1019, 1021, 1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069,
+    1087, 1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151,
+    1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223,
+    1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, 1289, 1291,
+    1297, 1301, 1303, 1307, 1319, 1321, 1327, 1361, 1367, 1373,
+    1381, 1399, 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451,
+    1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511,
+    1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, 1579, 1583,
+    1597, 1601, 1607, 1609, 1613, 1619, 1621, 1627, 1637, 1657,
+    1663, 1667, 1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733,
+    1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811,
+    1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, 1879, 1889,
+    1901, 1907, 1913, 1931, 1933, 1949, 1951, 1973, 1979, 1987,
+    1993, 1997, 1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053,
+    2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129,
+    2131, 2137, 2141, 2143, 2153, 2161, 2179, 2203, 2207, 2213,
+    2221, 2237, 2239, 2243, 2251, 2267, 2269, 2273, 2281, 2287,
+    2293, 2297, 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357,
+    2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423,
+    2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, 2521, 2531,
+    2539, 2543, 2549, 2551, 2557, 2579, 2591, 2593, 2609, 2617,
+    2621, 2633, 2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687,
+    2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741,
+    2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, 2803, 2819,
+    2833, 2837, 2843, 2851, 2857, 2861, 2879, 2887, 2897, 2903,
+    2909, 2917, 2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999,
+    3001, 3011, 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079,
+    3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, 3169, 3181,
+    3187, 3191, 3203, 3209, 3217, 3221, 3229, 3251, 3253, 3257,
+    3259, 3271, 3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331,
+    3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413,
+    3433, 3449, 3457, 3461, 3463, 3467, 3469, 3491, 3499, 3511,
+    3517, 3527, 3529, 3533, 3539, 3541, 3547, 3557, 3559, 3571,
+    3581, 3583, 3593, 3607, 3613, 3617, 3623, 3631, 3637, 3643,
+    3659, 3671, 3673, 3677, 3691, 3697, 3701, 3709, 3719, 3727,
+    3733, 3739, 3761, 3767, 3769, 3779, 3793, 3797, 3803, 3821,
+    3823, 3833, 3847, 3851, 3853, 3863, 3877, 3881, 3889, 3907,
+    3911, 3917, 3919, 3923, 3929, 3931, 3943, 3947, 3967, 3989,
+    4001, 4003, 4007, 4013, 4019, 4021, 4027, 4049, 4051, 4057,
+    4073, 4079, 4091, 4093, 4099, 4111, 4127, 4129, 4133, 4139,
+    4153, 4157, 4159, 4177, 4201, 4211, 4217, 4219, 4229, 4231,
+    4241, 4243, 4253, 4259, 4261, 4271, 4273, 4283, 4289, 4297,
+    4327, 4337, 4339, 4349, 4357, 4363, 4373, 4391, 4397, 4409
+]
+
+
+def generate_n_primes(n: int) -> List[int]:
+    if n < len(PRIME_TABLE):
+        return PRIME_TABLE[0:n]
+
+    primes: List[int] = PRIME_TABLE.copy()
+    num: int = primes[-1] + 2
+    while len(primes) < n:
+        is_prime = True
+        for p in primes:
+            if num % p == 0:
+                is_prime = False
+                break
+        if is_prime:
+            primes.append(num)
+        num += 2
+    return primes

mg-pso-gui-0.1.128/mgpsogui/util/recosu/sampling/random/random_sampler.py

@@ -0,0 +1,34 @@
+from collections.abc import Iterable
+import random
+
+
+class RandomSampleGenerator:
+    index: int
+    count: int
+    num_parameters: int
+    rand: random.Random
+
+    def __init__(self, count: int, num_parameters: int):
+        assert (count > 0)
+        self.index = 1
+        self.count = count + 1
+        self.num_parameters = num_parameters
+        self.rand = random.Random()
+
+    def __iter__(self) -> Iterable[tuple[int, list[float]]]:
+        return self
+
+    def __next__(self) -> tuple[int, list[float]]:
+        if self.index >= self.count:
+            raise StopIteration
+
+        i: int = 0
+        values: list[float] = []
+        while i < self.num_parameters:
+            values.append(self.rand.uniform(0, 1))
+            i = i + 1
+
+        result: tuple[int, list[float]] = (self.index, values)
+        self.index = self.index + 1
+        return result
+

mg-pso-gui-0.1.126/mgpsogui/util/recosu/sampling/sampler.py → mg-pso-gui-0.1.128/mgpsogui/util/recosu/sampling/sampling.py

@@ -3,11 +3,11 @@ import math
 import asyncio
 import concurrent
 import datetime
-from recosu.utils import utils
-from recosu.sampling.halton.halton import HaltonSampleGenerator
-from recosu.sampling.random.random_sampler import RandomSampleGenerator
-from recosu.sampling.sampler_task import SamplerTask
-from recosu.sampling.sample_trace_writer import SampleTraceWriter
+from ..utils import utils
+from ..sampling.halton.halton import HaltonSampleGenerator
+from ..sampling.random.random_sampler import RandomSampleGenerator
+from ..sampling.sampler_task import SamplerTask
+from ..sampling.sample_trace_writer import SampleTraceWriter
 
 
 def weighted_value(weight: float, lower: float, upper: float) -> float:

{mg-pso-gui-0.1.126 → mg-pso-gui-0.1.128}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.126'
+VERSION = '0.1.128'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()
 

mg-pso-gui-0.1.126/mgpsogui/util/recosu/sampling/__init__.py

@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-LUCA/PSO toolkit
-=========================================
-This is ...
-
-"""
-