Moved all external "C" functions to Utilities.Auxiliary

Replaceable Seeds should now be standard conform for extending
DLR-SR · Jun 25, 2014 · cd0e498 · cd0e498
1 parent db11763
commit cd0e498
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 14 deletions.
diff --git a/Noise/PRNG.mo b/Noise/PRNG.mo
@@ -144,7 +144,7 @@ public
   parameter Boolean useGlobalSeed = true
     "Combine local seed value with global seed" annotation(choices(checkBox=true),Dialog(group = "Initialization"));
   final parameter Integer seed=if useGlobalSeed then
-      Noise.Utilities.Seedings.combineSeedLCG(localSeed, globalSeed.seed)
+      Noise.Utilities.Auxiliary.combineSeedLCG(localSeed, globalSeed.seed)
        else localSeed;
 initial equation
   if useSampleBasedMethods then

diff --git a/Noise/Seed/Seed_Real.mo b/Noise/Seed/Seed_Real.mo
@@ -1,7 +1,11 @@
 within Noise.Seed;
 function Seed_Real "Uses the real value for seeding"
   extends Utilities.Interfaces.Seed;
-  external "C" NOISE_SeedReal(local_seed, global_seed, real_seed, n, states);
+algorithm
+  states := Noise.Utilities.Auxiliary.SeedReal(local_seed=  local_seed,
+                                               global_seed= global_seed,
+                                               real_seed=   real_seed,
+                                               n=           n);
 
  annotation (Include = "#include \"ModelicaNoise.c\"", Documentation(revisions="<html>
 <p><img src=\"modelica://Noise/Resources/Images/dlr_logo.png\"/> <b>Developed 2014 at the DLR Institute of System Dynamics and Control</b> </p>

diff --git a/Noise/Utilities/Auxiliary/SeedReal.mo b/Noise/Utilities/Auxiliary/SeedReal.mo
@@ -0,0 +1,17 @@
+within Noise.Utilities.Auxiliary;
+function SeedReal "Uses a real value for initializing an RNG's state vector"
+
+  input Integer local_seed "The local seed";
+  input Integer global_seed "The global seed";
+  input Real real_seed "The real seed";
+  input Integer n "The number of initial state values to be generated";
+  output Integer states[n] "The generated initial states";
+
+  external "C" NOISE_SeedReal(local_seed, global_seed, real_seed, n, states);
+
+ annotation (Include = "#include \"ModelicaNoise.c\"", Documentation(revisions="<html>
+<p><img src=\"modelica://Noise/Resources/Images/dlr_logo.png\"/> <b>Developed 2014 at the DLR Institute of System Dynamics and Control</b> </p>
+</html>", info="<html>
+<p>This function converts the Real value to Integer values and fills the state vector with them.</p>
+</html>"));
+end SeedReal;
diff --git a/Noise/Utilities/Seedings/combineSeedLCG.mo → Noise/Utilities/Auxiliary/combineSeedLCG.mo b/Noise/Utilities/Seedings/combineSeedLCG.mo → Noise/Utilities/Auxiliary/combineSeedLCG.mo
@@ -1,4 +1,4 @@
-within Noise.Utilities.Seedings;
+within Noise.Utilities.Auxiliary;
 function combineSeedLCG "combines two seed values in an LCG fashion"
   extends Interfaces.combineSeed;
 

diff --git a/Noise/Utilities/Auxiliary/package.order b/Noise/Utilities/Auxiliary/package.order
@@ -1 +1,3 @@
 shuffleDouble
+SeedReal
+combineSeedLCG
diff --git a/Noise/Utilities/Seedings/package.mo b/Noise/Utilities/Seedings/package.mo
diff --git a/Noise/Utilities/Seedings/package.order b/Noise/Utilities/Seedings/package.order
diff --git a/Noise/Utilities/package.order b/Noise/Utilities/package.order
@@ -4,4 +4,3 @@ Analysis
 Auxiliary
 Math
 Interaction
-Seedings