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.

Sign up for GitHub

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

Jump to bottom

Remove deprecated MLCG #3189

Merged
merged 1 commit into from
Nov 9, 2024
Merged

Remove deprecated MLCG #3189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 21 deletions docs/hoc/programming/math/random.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,6 @@ Random Class



.. hoc:method:: Random.MLCG


Syntax:
``r.MLCG()``

``r.MLCG(seed1)``

``r.MLCG(seed1, seed2)``


Description:
Use a Multiplicative Linear Congruential Generator. Not as high
quality as the ACG. It uses only 8 bytes.



----



.. hoc:method:: Random.MCellRan4


Expand Down
21 changes: 0 additions & 21 deletions docs/python/programming/math/random.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,27 +99,6 @@ Random Class



.. method:: Random.MLCG


Syntax:
``r.MLCG()``

``r.MLCG(seed1)``

``r.MLCG(seed1, seed2)``


Description:
Use a Multiplicative Linear Congruential Generator. Not as high
quality as the ACG. It uses only 8 bytes.



----



.. method:: Random.MCellRan4


Expand Down
1 change: 0 additions & 1 deletion share/lib/helpdict
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ min Vector classes general neuron.exe Reference 160 neuron/general/classes/vecto
min_ind Vector classes general neuron.exe Reference 160 neuron/general/classes/vector/vect2.html#min_ind
Miscellaneous Tools NEURONMainMenu GUI Reference 418 neuron/stdrun/0stdrun.html#Miscellaneous
mktemp File classes general neuron.exe Reference 29 neuron/general/classes/file.html#mktemp
MLCG Random classes general neuron.exe Reference 97 neuron/general/classes/random.html#MLCG
ModelDescriptionIssues CVode classes neuron neuron.exe Reference 257 neuron/neuron/classes/cvode.html#ModelDescriptionIssues
ModelDescriptionLanguage NMODL Reference 388 neuron/nmodl/nmodl.html#ModelDescriptionLanguage
MoveText Graph LookAndFeel GUI Reference 18 neuron/agui/gui.html#MoveText
Expand Down
1 change: 0 additions & 1 deletion src/gnu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ add_library(
LogNorm.cpp
MCellRan4RNG.cpp
mcran4.cpp
MLCG.cpp
NegExp.cpp
Normal.cpp
nrnisaac.cpp
Expand Down
110 changes: 0 additions & 110 deletions src/gnu/MLCG.cpp
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions src/gnu/MLCG.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/gnu/RNG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ union PrivateRNGDoubleType { // used to access doubles as unsigneds
};

//
// Base class for Random Number Generators. See ACG and MLCG for instances.
// Base class for Random Number Generators. See ACG for instances.
//
class RNG {
static PrivateRNGSingleType singleMantissa; // mantissa bit vector
Expand Down
2 changes: 1 addition & 1 deletion src/gnu/Rand.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ struct Object;

/* type_:
* 0: ACG
* 1: MLCG
* 1: unused
* 2: MCellRan4
* 3: Isaac64
* 4: Random123
Expand Down
25 changes: 0 additions & 25 deletions src/ivoc/ivocrand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <nrnran123.h>

#include <ACG.h>
#include <MLCG.h>
#include <Random.h>
#include <Poisson.h>
#include <Normal.h>
Expand Down Expand Up @@ -133,29 +132,6 @@ static double r_ACG(void* r) {
return 1.;
}

// Use a Multiplicative Linear Congruential Generator. Not as high
// quality as the ACG, but uses only 8 bytes
// syntax:
// r.MLCG([seed1],[seed2])

static double r_MLCG(void* r) {
Rand* x = (Rand*) r;

unsigned long seed1 = 0;
unsigned long seed2 = 0;

if (ifarg(1))
seed1 = long(*getarg(1));
if (ifarg(2))
seed2 = long(*getarg(2));

x->rand->generator(new MLCG(seed1, seed2));
delete x->gen;
x->gen = x->rand->generator();
x->type_ = 1;
return 1.;
}

static double r_MCellRan4(void* r) {
Rand* x = (Rand*) r;

Expand Down Expand Up @@ -489,7 +465,6 @@ extern "C" void nrn_random_play() {


static Member_func r_members[] = {{"ACG", r_ACG},
{"MLCG", r_MLCG},
{"Isaac64", r_Isaac64},
{"MCellRan4", r_MCellRan4},
{"Random123", r_nrnran123},
Expand Down
Loading