Changeset 45b1fd8 in tol

Timestamp:

Sep 19, 2012, 8:47:26 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

04e6eaf

Parents:

76571c9

Message:

Refs #1136
Now, RandStationary can draw inverse of roots in an specified interval inside (0,1)

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5082 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/polynomial_type

Files:

• polgra.cpp (modified) (5 diffs)
• tol_bpolgra.h (modified) (1 diff)

tol/btol/polynomial_type/polgra.cpp

@@ -502 +502 @@
   BInt degree, 
   BInt period, 
+  BDat minInvRootModule, 
   BDat maxInvRootModule)
 //--------------------------------------------------------------------
@@ -515 +516 @@
   BPol factor;
   if(maxInvRootModule>1-2*DEpsilon()) { maxInvRootModule = 1-2*DEpsilon(); }
-  else if(maxInvRootModule<0) { maxInvRootModule = 0; }
+  if(maxInvRootModule<  2*DEpsilon()) { maxInvRootModule =   2*DEpsilon(); }
+  if(minInvRootModule<  2*DEpsilon()) { minInvRootModule =   2*DEpsilon(); }
+  if(minInvRootModule>maxInvRootModule) 
+  { 
+    Error("[RandStationary] Cannot draw in empty interval ["+minInvRootModule+","+maxInvRootModule+"]");
+    return(factor);
+  }
   if(n1)
   {
-    a = maxInvRootModule*u.Random();
+    BDat ur = u.Random();
+    a = maxInvRootModule*ur + minInvRootModule*(1-ur);
     factor = B0-a*BP;
   //Std(BText("\nRandStationary(")+degree+","+period+","+maxInvRootModule+") monome a="+a+"; factor="+factor.Name());
@@ -544 +552 @@
       ok = (a<1-b) &&
            (a<1+b) &&
-           (m1<maxInvRootModule) &&
-           (m2<maxInvRootModule);
+           (m1>=minInvRootModule) &&
+           (m2>=minInvRootModule) &&
+           (m1<=maxInvRootModule) &&
+           (m2<=maxInvRootModule);
       if(ok) 
       { 
@@ -559 +569 @@
 //--------------------------------------------------------------------
 DeclareContensClass(BPol, BPolTemporary, BPolRandStationary);
-DefExtOpr(1, BPolRandStationary, "RandStationary", 1, 3, 
-  "Real Real Real",
-  "(Real d [, Real p = 1, Real maxInvRootModule = 0.999999])",
+DefExtOpr(1, BPolRandStationary, "RandStationary", 1, 4, 
+  "Real Real Real Real",
+  "(Real d [, Real p = 1, "
+    "Real minInvRootModule = 0.000001, "
+    "Real maxInvRootModule = 0.999999])",
   I2("Returns a random stationary polinomial as \n",
      "Devuelve un polinomio estacionario aleatorio de la forma \n") +
@@ -572 +584 @@
   BInt degree = (BInt)Real(Arg(1));
   BInt period = 1;
+  BDat minInvRootModule = .000001;
   BDat maxInvRootModule = .999999;
   if(Arg(2)) { period = (BInt)Real(Arg(2)); }
-  if(Arg(3)) { maxInvRootModule = Dat(Arg(3)); }
-  contens_ = RandStationary(degree, period, maxInvRootModule);
+  if(Arg(3)) { minInvRootModule = Dat(Arg(3)); }
+  if(Arg(4)) { maxInvRootModule = Dat(Arg(4)); }
+  contens_ = RandStationary(degree, period, minInvRootModule, maxInvRootModule);
 }
 

tol/btol/polynomial_type/tol_bpolgra.h

@@ -44 +44 @@
   BInt degree, 
   BInt period, 
+  BDat minInvRootModule=.000001, 
   BDat maxInvRootModule=.999999);