Fix the warning: 22/10322/3
Sylvestre Ledru [Sun, 27 Jan 2013 09:08:45 +0000 (10:08 +0100)]
Syntax "vector ^ scalar" is obsolete. It will be removed in Scilab 6.0.
Use "vector .^ scalar" instead.

Change-Id: I6f74ad5d0368fd34f9de0af756e718926962298a

scilab/modules/cacsd/help/en_US/plot_display/black.xml
scilab/modules/interpolation/help/en_US/interp1.xml
scilab/modules/signal_processing/help/en_US/frfit.xml

index 554fa69..b7877d8 100644 (file)
         <programlisting role="exemple"><![CDATA[
     //Black diagram
     s=poly(0,'s');
-    sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
+    sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
     clf();black(sl,0.01,10);
     ]]></programlisting>
         <para>
             <scilab:image>
                 s=poly(0,'s');
-                sl=syslin('c',5*(1+s)/(.1*s^4+s^3+15*s^2+3*s+1))
-                clf();black(sl,0.01,10);
+                sl=syslin('c',5*(1+s)/(.1*s.^4+s.^3+15*s.^2+3*s+1))
+                black(sl,0.01,10);
             </scilab:image>
         </para>
         <programlisting role="example"><![CDATA[
     Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
     //two degree of freedom PID
     tau=0.2;xsi=1.2;
-    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
+    PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
     clf();
     black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
     //move the caption in the lower rigth corner
                 s=poly(0,'s');
                 Plant=syslin('c',16000/((s+1)*(s+10)*(s+100)));
                 tau=0.2;xsi=1.2;
-                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau^2*s^2));
-                clf();
+                PID=syslin('c',(1/(2*xsi*tau*s))*(1+2*xsi*tau*s+tau.^2*s.^2));
                 black([Plant;Plant*PID ],0.01,100,["Plant";"Plant and PID corrector"]);
                 ax=gca();Leg=ax.children(1);
                 Leg.legend_location="in_lower_right";
index ad1e6a1..eb1835e 100644 (file)
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 x=linspace(0,3,20);
-y=x^2;
+y=x.^2;
 xx=linspace(0,3,100);
 yy1=interp1(x,y,xx,'linear');
 yy2=interp1(x,y,xx,'spline');
@@ -154,7 +154,7 @@ legend(['linear','spline','nearest'],a=2)
  ]]></programlisting>
         <scilab:image>
             x=linspace(0,3,20);
-            y=x^2;
+            y=x.^2;
             xx=linspace(0,3,100);
             yy1=interp1(x,y,xx,'linear');
             yy2=interp1(x,y,xx,'spline');
index f6eb823..ab0ea9d 100644 (file)
@@ -66,8 +66,9 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[ 
-w=0.01:0.01:2;s=poly(0,'s');
-G=syslin('c',2*(s^2+0.1*s+2), (s^2+s+1)*(s^2+0.3*s+1));
+w=0.01:0.01:2;
+s=poly(0,'s');
+G=syslin('c',2*(s.^2+0.1*s+2), (s.^2+s+1)*(s.^2+0.3*s+1));
 fresp=repfreq(G,w);
 Gid=frfit(w,fresp,4);
 frespfit=repfreq(Gid,w);
@@ -76,7 +77,7 @@ bode(w,[fresp;frespfit])
         <scilab:image>
             w=0.01:0.01:2;
             s=poly(0,'s');
-            G=syslin('c',2*(s^2+0.1*s+2), (s^2+s+1)*(s^2+0.3*s+1));
+            G=syslin('c',2*(s.^2+0.1*s+2), (s.^2+s+1)*(s.^2+0.3*s+1));
             fresp=repfreq(G,w);
             Gid=frfit(w,fresp,4);
             frespfit=repfreq(Gid,w);