Changeset e9e4854 in tol

Timestamp:

Apr 15, 2011, 10:02:11 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

fcb7cd1

Parents:

84be16b

Message:

Fixes #1167

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

Location:

tol

Files:

• btol/bmodel/estim.cpp (modified) (3 diffs)
• stdlib/gui/html/_htmlmethods.tol (modified) (2 diffs)
• stdlib/gui/html/_htmlutil.tol (modified) (1 diff)

tol/btol/bmodel/estim.cpp

@@ -900 +900 @@
 }
 
-
+/*
 //--------------------------------------------------------------------
 DeclareContensClass(BPol, BPolTemporary, BPolAutoReg);
@@ -926 +926 @@
 }
 
-
+/*
 //--------------------------------------------------------------------
 DeclareContensClass(BSet, BSetTemporary, BSetAutoRegInt);
@@ -952 +952 @@
   );
 }
-
+*/
 
 

tol/stdlib/gui/html/_htmlmethods.tol

@@ -376 +376 @@
 
 //////////////////////////////////////////////////////////////////////////////
-   Text HtmlLinReg(Set series)
-
-// PURPOSE: Creates an HTML text width a linear regression report of series
-//
-//////////////////////////////////////////////////////////////////////////////
-{
-  Real n = Card(series); 
-  If
-  (
-    n<2,
-    {
-      WriteLn("Error: Son necesarias al menos dos series para calcular "+
-              "la regresión lineal.");
-      "Número de series = " + IntText(n)
-    },
-    {
-      HtmlLinearRegression(series, Periodicity(series[1]))
-    }
-  ) 
-};
-
-
-//////////////////////////////////////////////////////////////////////////////
   Text HtmlAutoReg(Set  series,
                    Real periodicidad,
@@ -592 +569 @@
   @SeriesMethodStruct("Componentes" , Copy(HtmlSeriesComponents), Empty);
 
-Set LinRegMet = 
-  @SeriesMethodStruct("Regresión lineal" , Copy(HtmlLinReg), Empty);
-
 
 //////////////////////////////////////////////////////////////////////////////

tol/stdlib/gui/html/_htmlutil.tol

@@ -235 +235 @@
 
 
-
-//////////////////////////////////////////////////////////////////////////////
-   Text HtmlLinearRegression(Set ser, Real period)
-
-// PURPOSE: Creates an HTML text width a linear regression report of series
-//
-//////////////////////////////////////////////////////////////////////////////
-{ 
-  Text old = PutEditor("");
-  
-  Text tmpDir = Replace(TmpDir,"\\","/"); 
-
-  Text rand = FormatReal(Rand(0,99999999),"%0.lf");
-
-  Text outputName = Identify(ser[1]);
-
-  Serie output = ser[1];
-
-  Text CreaInputExpresion(Real n, Real k)
-  {
-    Text name = Identify(ser[n]);
-    Text expr = "(B^"+k+"):("+name+");";
-    expr
-  };    
-  Set    ARIEst = AutoRegInt(output, period);
-  Polyn  DIF    = ARIEst[1];
-  Polyn  AR     = ARIEst[2];
-  Polyn  ARI    = DIF*AR;
-  Real degree   = Degree(ARI)-1;
-
-  Set  inputBackNames = For
-  (
-    1,
-    Card(ser),
-    Set s(Real n)
-    { 
-      If
-      (
-        n==1, 
-        For(1, degree, Text(Real k) { CreaInputExpresion(n,k) } ),
-        For(0, 2,      Text(Real k) { CreaInputExpresion(n,k) } )
-      )
-    }
-  );
-  Set idSet = SetConcat(inputBackNames);
-  Set input = EvalSet(idSet, Serie (Text expr) { Eval(expr) } );
-
-  Real n = Card(input);
-
-  Set lr = LinearRegression
-  (
-    output,
-    input
-  );
-
-  
-  Set param = lr[2];
-  Set ParInf = 
-  {
-    Set For
-    ( 
-      1,n,
-      Set linePar(Real i)
-      {
-        Text id = idSet[i];  
-        Set p1 = param[i];
-        Set p2 = SetOfReal(p1[2],p1[3],p1[4],p1[5]);
-        [[id]] + p2
-      }
-    )
-  };
-  
-  Set ExprInf = 
-  {
-    Set For
-    ( 
-      1,n,
-      Text lineExpr(Real i)
-      {
-        Real j = n-i+1;
-        Text id = idSet[j];  
-        Set p1 = param[j];
-        Real coef = p1[2];
-        Real aCoef = Abs(coef); 
-        Text sig = If(coef>0, "+",  "-");
-        NL + "    " + sig + aCoef + "*" + id
-      }
-    )
-  };
-
-  Real outStd = StDsS(output);
-  Set  info   = lr[3];
-  Real err    = info[5];
-  Real sw     = info[6]*2;
-  Text expression = "Est" + outputName + " = " + 
-                    Text (SetSum( ExprInf)) + 
-                    NL + "    + Gaussian(0," + err +")";
-
-  Text InfoFile = 
-  {
-    Text txt = 
-      "Concepto;"                         + "Valor"  + ";" + NL +
-      "Fecha inicial;"                    + info[ 1] + ";" + NL +
-      "Fecha final;"                      + info[ 2] + ";" + NL +
-      "Número de datos;"                  + info[ 3] + ";" + NL +
-      "Número de variables;"              + info[ 4] + ";" + NL +
-      "Error estandar de "+outputName+";" + outStd   + ";" + NL +
-      "Error estandar de los residuos;"   + err      + ";" + NL +
-      "Inform. Swartz;"                   + sw       + ";" + NL +
-      "F de Snedecor;"                    + info[10] + ";" + NL +
-      "Alfa;"                             + info[11] + ";" + NL; 
-    WriteFile(tmpDir + "/Info"+rand+".txt", txt)
-  };
-  
-  Text ParFile =
-  {
-    Text pFile = tmpDir + "/Par" + rand + ".txt";
-    Set Table(SetOfSet(ParInf),pFile);
-    Text t1 = ReadFile(pFile);
-    Text t2 = Replace(t1, Quotes, "");
-    Text head = "Nombre; Valor; Desv. Típ.; t de Student; 1-Alfa;"+NL;
-    WriteFile(pFile,head+t2)
-  };
-
-  Serie residuals = lr[1];
-  Serie prevHist  = output - residuals;
-
-  Set seriesReport = [[output,prevHist]];
-
-  Text aiaHtml = ""; 
-  Set aia = AIA(residuals+0, 1/ARI);
-  Real If(Card(aia),
-  {
-    Text AIAFile = tmpDir + "/AIA" + rand + ".txt";
-    Set Table([[aia]],AIAFile);
-    Text 
-    (
-      aiaHtml := 
-      "  <LI>" + HtmlTitle("Análisis de Intervención Automático",3,TitCol)+
-        HtmlTable(AIAFile)+ BR
-    );
-    Real SystemDelete(AIAFile)
-  });
-
-  Text report = 
-    "<OL>" +
-    "  <LI>" + HtmlTitle("Gráfico de previsión",3,TitCol)+
-      HtmlBdtChart(seriesReport) +  BR +
-    "  <LI>" + HtmlTitle("Información",3,TitCol)+
-      HtmlTable(InfoFile)+ BR +
-    "  <LI>" + HtmlTitle("Parámetros",3,TitCol)+
-      HtmlTable(ParFile)+ BR +
-    aiaHtml +
-    "  <LI>" + HtmlTitle("Correlaciones de los parámetros",3,TitCol)+ 
-      HtmlMatrixTable(lr[5],idSet,idSet,"Correlación") + BR +
-    "  <LI>" + HtmlTitle("Gráfico de error de la previsión",3,TitCol)+
-      HtmlBdtChart([[residuals]]) +  BR +
-    "  <LI>" + HtmlTitle("Autocorrelaciones de los residuos", 3, Blue) +
-               HtmlAutoCorReport([[residuals]]) + BR +
-    "  <LI>" + HtmlTitle("Tabla de previsión histórica",3,TitCol)+
-      HtmlBdtTable([[output,prevHist,residuals]]) +
-    "</OL>";
-  
-  
-  Real SystemDelete(InfoFile);
-  Real SystemDelete(ParFile);
-
-      
-  Text PutEditor(old);
-  report 
-};
-
-
 //////////////////////////////////////////////////////////////////////////////
   Text HtmlAutoRegression(Serie z,