diff options
265 files changed, 3389 insertions, 12445 deletions
diff --git a/2.3-1/Visual-Studio-settings/f2c.xml b/2.3-1/Visual-Studio-settings/f2c.xml deleted file mode 100644 index b4df8830..00000000 --- a/2.3-1/Visual-Studio-settings/f2c.xml +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
- <Rule
- Name="f2c_rule"
- PageTemplate="tool"
- DisplayName="f2c rule"
- Order="200">
- <Rule.DataSource>
- <DataSource
- Persistence="ProjectFile"
- ItemType="f2c_rule" />
- </Rule.DataSource>
- <Rule.Categories>
- <Category
- Name="General">
- <Category.DisplayName>
- <sys:String>General</sys:String>
- </Category.DisplayName>
- </Category>
- <Category
- Name="Command Line"
- Subtype="CommandLine">
- <Category.DisplayName>
- <sys:String>Command Line</sys:String>
- </Category.DisplayName>
- </Category>
- </Rule.Categories>
- <StringListProperty
- Name="Inputs"
- Category="Command Line"
- IsRequired="true"
- Switch=" ">
- <StringListProperty.DataSource>
- <DataSource
- Persistence="ProjectFile"
- ItemType="f2c_rule"
- SourceType="Item" />
- </StringListProperty.DataSource>
- </StringListProperty>
- <StringProperty
- Name="CommandLineTemplate"
- DisplayName="Command Line"
- Visible="False"
- IncludeInCommandLine="False" />
- <DynamicEnumProperty
- Name="f2c_ruleBeforeTargets"
- Category="General"
- EnumProvider="Targets"
- IncludeInCommandLine="False">
- <DynamicEnumProperty.DisplayName>
- <sys:String>Execute Before</sys:String>
- </DynamicEnumProperty.DisplayName>
- <DynamicEnumProperty.Description>
- <sys:String>Specifies the targets for the build customization to run before.</sys:String>
- </DynamicEnumProperty.Description>
- <DynamicEnumProperty.ProviderSettings>
- <NameValuePair
- Name="Exclude"
- Value="^f2c_ruleBeforeTargets|^Compute" />
- </DynamicEnumProperty.ProviderSettings>
- <DynamicEnumProperty.DataSource>
- <DataSource
- Persistence="ProjectFile"
- HasConfigurationCondition="true" />
- </DynamicEnumProperty.DataSource>
- </DynamicEnumProperty>
- <DynamicEnumProperty
- Name="f2c_ruleAfterTargets"
- Category="General"
- EnumProvider="Targets"
- IncludeInCommandLine="False">
- <DynamicEnumProperty.DisplayName>
- <sys:String>Execute After</sys:String>
- </DynamicEnumProperty.DisplayName>
- <DynamicEnumProperty.Description>
- <sys:String>Specifies the targets for the build customization to run after.</sys:String>
- </DynamicEnumProperty.Description>
- <DynamicEnumProperty.ProviderSettings>
- <NameValuePair
- Name="Exclude"
- Value="^f2c_ruleAfterTargets|^Compute" />
- </DynamicEnumProperty.ProviderSettings>
- <DynamicEnumProperty.DataSource>
- <DataSource
- Persistence="ProjectFile"
- ItemType=""
- HasConfigurationCondition="true" />
- </DynamicEnumProperty.DataSource>
- </DynamicEnumProperty>
- <StringListProperty
- Name="Outputs"
- DisplayName="Outputs"
- Visible="False"
- IncludeInCommandLine="False" />
- <StringProperty
- Name="ExecutionDescription"
- DisplayName="Execution Description"
- Visible="False"
- IncludeInCommandLine="False" />
- <StringListProperty
- Name="AdditionalDependencies"
- DisplayName="Additional Dependencies"
- IncludeInCommandLine="False"
- Visible="true" />
- <StringProperty
- Subtype="AdditionalOptions"
- Name="AdditionalOptions"
- Category="Command Line">
- <StringProperty.DisplayName>
- <sys:String>Additional Options</sys:String>
- </StringProperty.DisplayName>
- <StringProperty.Description>
- <sys:String>Additional Options</sys:String>
- </StringProperty.Description>
- </StringProperty>
- </Rule>
- <ItemType
- Name="f2c_rule"
- DisplayName="f2c rule" />
- <FileExtension
- Name="*.f"
- ContentType="f2c_rule" />
- <ContentType
- Name="f2c_rule"
- DisplayName="f2c rule"
- ItemType="f2c_rule" />
-</ProjectSchemaDefinitions>
\ No newline at end of file diff --git a/2.3-1/demos/FilterResponse.dem.sce b/2.3-1/demos/FilterResponse.dem.sce new file mode 100644 index 00000000..7104836d --- /dev/null +++ b/2.3-1/demos/FilterResponse.dem.sce @@ -0,0 +1,18 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +//This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Author: Ankit Raj +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + + + +lines(0); + +global SCI2CHOME + +scilab2c(SCI2CHOME+"/tests/unit_tests/test_filterResponse/scilabcode/main.sci",TMPDIR,SCI2CHOME+"/tests/unit_tests/test_filterResponse/scilabcode"); diff --git a/2.3-1/demos/Jacobi.dem.sce b/2.3-1/demos/Jacobi.dem.sce new file mode 100644 index 00000000..0b1618c4 --- /dev/null +++ b/2.3-1/demos/Jacobi.dem.sce @@ -0,0 +1,18 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +// This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Author: Ankit Raj +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in + + + +lines(0); + +global SCI2CHOME + +scilab2c(SCI2CHOME+"/tests/unit_tests/test_jacobi/scilabcode/main.sci",TMPDIR,SCI2CHOME+"/tests/unit_tests/test_jacobi/scilabcode"); + diff --git a/2.3-1/demos/SVD.dem.sce b/2.3-1/demos/SVD.dem.sce new file mode 100644 index 00000000..d466964a --- /dev/null +++ b/2.3-1/demos/SVD.dem.sce @@ -0,0 +1,20 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +// This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Author: Sandeep Gupta +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in + + +lines(0); + +global SCI2CHOME + +scilab2c(SCI2CHOME+"tests/unit_tests/testLinearAlgebra/testsvd/testsvd.sci", TMPDIR); + +editor(TMPDIR+"/main.c"); + + diff --git a/2.3-1/demos/analogFilter.dem.sce b/2.3-1/demos/analogFilter.dem.sce new file mode 100644 index 00000000..674c9543 --- /dev/null +++ b/2.3-1/demos/analogFilter.dem.sce @@ -0,0 +1,18 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +//This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Author: Ankit Raj +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + + + +lines(0); + +global SCI2CHOME + +scilab2c(SCI2CHOME+"/tests/unit_tests/test_analogFilters/scilabcode/main.sci",TMPDIR,SCI2CHOME+"/tests/unit_tests/test_analogFilters/scilabcode"); diff --git a/2.3-1/demos/scilab2c.dem.gateway.sce b/2.3-1/demos/scilab2c.dem.gateway.sce index e9a83bf0..c1031048 100644 --- a/2.3-1/demos/scilab2c.dem.gateway.sce +++ b/2.3-1/demos/scilab2c.dem.gateway.sce @@ -16,10 +16,10 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce"; "Linear Regression" , "LinearRegression.dem.sce"; "Symbols", "Symbols.dem.sce"; "High Pass Filter", "Filter.dem.sce"; -<<<<<<< HEAD - ]; - -subdemolist(:,2) = demopath + subdemolist(:,2); + "Jacobi functions","Jacobi.dem.sce"; + "Analog Filters","analogFilter.dem.sce"; + "String Functions","string.dem.sce"; + "Filter Responses","FilterResponse.dem.sce"; ======= "Arduino blink", "blink.dem.sce"; "Arduino digital input", "digital_in.dem.sce"; @@ -30,4 +30,4 @@ subdemolist(:,2) = demopath + subdemolist(:,2); ]; subdemolist(:,2) = demopath + subdemolist(:,2); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + diff --git a/2.3-1/demos/string.dem.sce b/2.3-1/demos/string.dem.sce new file mode 100644 index 00000000..db90905e --- /dev/null +++ b/2.3-1/demos/string.dem.sce @@ -0,0 +1,16 @@ +// Copyright (C) 2017 - IIT Bombay - FOSSEE +//This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +// Author: Ankit Raj +// Organization: FOSSEE, IIT Bombay +// Email: toolbox@scilab.in +// + +lines(0); + +global SCI2CHOME + +scilab2c(SCI2CHOME+"/tests/unit_tests/test_string/scilabcode/main.sci",TMPDIR,SCI2CHOME+"/tests/unit_tests/test_string/scilabcode"); diff --git a/2.3-1/etc/scilab2c.start b/2.3-1/etc/scilab2c.start index 2b10a581..ff243e98 100644 --- a/2.3-1/etc/scilab2c.start +++ b/2.3-1/etc/scilab2c.start @@ -53,14 +53,10 @@ end // ============================================================================= if or(getscilabmode() == ["NW";"STD"]) then - mprintf("\tLoad demos\n"); + mprintf("\tLoad demos\n"); pathdemos = pathconvert(root_tlbx + "/demos/scilab2c.dem.gateway.sce",%f,%t); -<<<<<<< HEAD -// add_demo(gettext("Scilab2C"),pathdemos); -======= add_demo(gettext("Scilab2C"),pathdemos); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 clear pathdemos ; end diff --git a/2.3-1/help/en_US/AVRADCSetup.xml b/2.3-1/help/en_US/AVRADCSetup.xml deleted file mode 100644 index a0abf030..00000000 --- a/2.3-1/help/en_US/AVRADCSetup.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRADCSetup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRADCSetup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRADCSetup</refname> - <refpurpose>Function to initialise ADC of AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - AVRADCSetup(uint8 prescaler, uint8 adc_ref) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>prescaler:</term> - <listitem><para> prescaler to be used for generating ADC clock (0-7)</para></listitem></varlistentry> - <varlistentry><term>adc_ref :</term> - <listitem><para> reference voltage to be used for ADC conversion</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function initialises ADc of AVR with given parameters. 'prescaler' is needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending on MCU clock. 'adc_ref' selects one of the available reference voltage sources available. - </para> - <para> -The adc_ref can take the following values- -<itemizedlist> -<listitem><para>0 -> Voltage on VREF pin</para></listitem> -<listitem><para>1 -> Voltage on AVCC pin</para></listitem> -<listitem><para>2 -> Internal 2.56 reference voltage</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRADCSetup(128,0) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRReadADC">AVRReadADC</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRDigitalIn.xml b/2.3-1/help/en_US/AVRDigitalIn.xml deleted file mode 100644 index ef87407c..00000000 --- a/2.3-1/help/en_US/AVRDigitalIn.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRDigitalIn.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRDigitalIn" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRDigitalIn</refname> - <refpurpose>Function to get state (high\low) of a digital input pin on AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - state=AVRDigitalIn(port,pin) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>port :</term> - <listitem><para> port of microcontroller to be used</para></listitem></varlistentry> - <varlistentry><term>pin :</term> - <listitem><para> pin of port (mentioned above) to be used</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each AVR microcontroller has pins which can be configured as digital -inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port as -digital input. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -pinA0 = AVRDigitalIn(1,0) //To read state on pin 0 of port A - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRDigitalOut">AVRDigitalSetup</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRDigitalOut.xml b/2.3-1/help/en_US/AVRDigitalOut.xml deleted file mode 100644 index 0ce8197f..00000000 --- a/2.3-1/help/en_US/AVRDigitalOut.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRDigitalOut.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRDigitalOut" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRDigitalOut</refname> - <refpurpose>Function to change state (high\low) of a digital output pin on AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - AVRDigitalOut(port,pin,state) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>port :</term> - <listitem><para> port of microcontroller to be used</para></listitem></varlistentry> - <varlistentry><term>pin :</term> - <listitem><para> pin of port (mentioned above) to be used</para></listitem></varlistentry> - <varlistentry><term>state :</term> - <listitem><para> state to be outputed on pin (HIGH\LOW)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each AVR microcontroller has pins which can be configured as digital -outputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port as -digital output. Also, desired output state must be specified as -'HIGH' or 'LOW'. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRDigitalOut('A',0,HIGH) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRDigitalIn">AVRDigitalIn</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRDigitalPortSetup.xml b/2.3-1/help/en_US/AVRDigitalPortSetup.xml deleted file mode 100644 index 8b7b15dc..00000000 --- a/2.3-1/help/en_US/AVRDigitalPortSetup.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRDigitalPortSetup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRDigitalPortSetup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRDigitalPortSetup</refname> - <refpurpose>Function to decide direction of port on AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - AVRDigitalPortSetup(port,direction) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>port :</term> - <listitem><para> port of microcontroller to be used(1 for PORTA, 2 for PORTB,...)</para></listitem></varlistentry> - <varlistentry><term>direction :</term> - <listitem><para> direction to be set for pin (0 for INPUT, 1 for OUTPUT)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each AVR microcontroller has pins which can be configured as digital -outputs/inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port to be -used as digital output/input. Also, desired direction must be specified as -'INPUT' or 'OUTPUT'. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRDigitalPortSetup(1,0); //This function will make PortA as input port - - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRDigitalIn">AVRDigitalOut</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRDigitalSetup.xml b/2.3-1/help/en_US/AVRDigitalSetup.xml deleted file mode 100644 index a2285730..00000000 --- a/2.3-1/help/en_US/AVRDigitalSetup.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRDigitalSetup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRDigitalSetup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRDigitalSetup</refname> - <refpurpose>Function to decide direction of a digital pin on AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - AVRDigitalSetup(port,pin,direction) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>port :</term> - <listitem><para> port of microcontroller to be used</para></listitem></varlistentry> - <varlistentry><term>pin :</term> - <listitem><para> pin of port (mentioned above) to be used</para></listitem></varlistentry> - <varlistentry><term>direction :</term> - <listitem><para> direction to be set for pin (INPUT\OUTPUT)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each AVR microcontroller has pins which can be configured as digital -outputs/inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port to be -used as digital output/input. Also, desired direction must be specified as -'INPUT' or 'OUTPUT'. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRDigitalSetup('A',0,OUTPUT) - - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRDigitalIn">AVRDigitalOut</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRGetTimerValue.xml b/2.3-1/help/en_US/AVRGetTimerValue.xml deleted file mode 100644 index f639c60d..00000000 --- a/2.3-1/help/en_US/AVRGetTimerValue.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRGetTimerValue.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRGetTimerValue" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRGetTimerValue</refname> - <refpurpose>Function to get timer count</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>timer :</term> - <listitem><para> timer whose current count is to be returned</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function returns the count value of a desired timer.By knowing the count value certain interrupt action can be taken. - </para> - <para> -Timer can take the following values -<itemizedlist> -<listitem><para>0 -> for timer0</para></listitem> -<listitem><para>1 -> for timer1</para></listitem> -<listitem><para>2 -> for timer2</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRGetTimerValue(0); //returns present count of the TCNT0 counter - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRTimerSetup">AVRTimerSetup</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM0SetDuty.xml b/2.3-1/help/en_US/AVRPWM0SetDuty.xml deleted file mode 100644 index a3f26812..00000000 --- a/2.3-1/help/en_US/AVRPWM0SetDuty.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM0SetDuty.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM0SetDuty" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM0SetDuty</refname> - <refpurpose>Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>duty :</term> - <listitem><para> It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.In this function by varying the duty cycle, varying voltage can be produced. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRPWM0SetDuty(50); //Produces 2.5V at OC0 pin -AVRPWM0SetDuty(0); //Produces 0V at OC0 pin - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM0Setup">AVRPWM0Setup</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM0Setup.xml b/2.3-1/help/en_US/AVRPWM0Setup.xml deleted file mode 100644 index f72f2582..00000000 --- a/2.3-1/help/en_US/AVRPWM0Setup.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM0Setup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM0Setup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM0Setup</refname> - <refpurpose>Function to Setup OC0 pin for required PWM mode</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>waveform_mode:</term> - <listitem><para> integer, from 0 to 2</para></listitem></varlistentry> - <varlistentry><term>output_mode:</term> - <listitem><para> integer, from 0 to 1 (or 2) depending on the waveform_mode</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC0 pin to produce required -output waveform by setting the waveform mode and otput mode. - </para> - <para> -waveform_mode can take values- -<itemizedlist> -<listitem><para>0 -> for Phase correct PWM Mode</para></listitem> -<listitem><para>1 -> for Fast PWM Mode</para></listitem> -<listitem><para>2 -> for CTC Mode</para></listitem> -</itemizedlist> - </para> - <para> -output_mode can take values- -<itemizedlist> -For Phase correct PWM Mode: -<listitem><para>0 for Clear OC0 on compare match when up-counting. Set OC0 on compare match when down-counting.</para></listitem> -<listitem><para>1 for Set OC0 on compare match when up-counting. Clear OC0 on compare match when down-counting.</para></listitem> -For Fast PWM Mode: -<listitem><para>0 for non-inverted output i.e Clear OC0 on compare match, set OC0 at BOTTOM.</para></listitem> -<listitem><para>1 for inverted output i.e Set OC0 on compare match, clear OC0 at BOTTOM.</para></listitem> -For CTC Mode: -<listitem><para>0 to Clear OC0 on compare match</para></listitem> -<listitem><para>1 to Set OC0 on compare match</para></listitem> -<listitem><para>2 to toggle OC0 on compare match</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRPWM0Setup(2,0); //This function will select CTC waveform mode and will clear OC0 on compare match - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM0SetDuty">AVRPWM0SetDuty</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM1SetDuty.xml b/2.3-1/help/en_US/AVRPWM1SetDuty.xml deleted file mode 100644 index 83230ea8..00000000 --- a/2.3-1/help/en_US/AVRPWM1SetDuty.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM1SetDuty.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM1SetDuty" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM1SetDuty</refname> - <refpurpose>Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>ouput_pin:</term> - <listitem><para> integer, 0 (for OC1A) or 1 (for OC1B)</para></listitem></varlistentry> - <varlistentry><term>duty:</term> - <listitem><para> It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</para></listitem></varlistentry> - <varlistentry><term>Top_Value:</term> - <listitem><para> It holds an integer value from 0 to 65535.This value sets the Top value of the counter TCNT1 i.e ICR.(for more info refer datasheet)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.This function Sets the duty cycle of output PWM signal.Also this function -decides the Top Vale of TCNT1 and the output pin to output PWM signal. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -Example -AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty cycle on OC1A pin and TCNT1 will reset at 40000 instead at 65535. -</para> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM1Setup">AVRPWM1Setup</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM1Setup.xml b/2.3-1/help/en_US/AVRPWM1Setup.xml deleted file mode 100644 index 14984130..00000000 --- a/2.3-1/help/en_US/AVRPWM1Setup.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM1Setup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM1Setup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM1Setup</refname> - <refpurpose>Function to Setup OC1A or OC1B pin for required PWM mode</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>waveform_mode:</term> - <listitem><para> integer, from 0 to 2</para></listitem></varlistentry> - <varlistentry><term>output_mode:</term> - <listitem><para> integer, from 0 to 1 (or 2) depending on the waveform_mode</para></listitem></varlistentry> - <varlistentry><term>output_pin:</term> - <listitem><para> 0 (for OC1A) or 1 for (OC1B)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC1A or OC1B pin to produces required -output waveform by setting the waveform mode and otput mode. - </para> - <para> -waveform_mode can take values- -<itemizedlist> -<listitem><para>0 -> for Phase correct PWM Mode</para></listitem> -<listitem><para>1 -> for Fast PWM Mode</para></listitem> -<listitem><para>2 -> for CTC Mode</para></listitem> -</itemizedlist> - </para> - <para> -output_mode can take values- -<itemizedlist> -For Phase correct PWM Mode: -<listitem><para>0 for Clear OC1A or OC1B on compare match when up-counting. Set OC1A or OC1B on compare match when down-counting.</para></listitem> -<listitem><para>1 for Set OC1A or OC1B on compare match when up-counting. Clear OC1A or OC1B on compare match when down-counting.</para></listitem> -For Fast PWM Mode: -<listitem><para>0 for non-inverted output i.e Clear OC1A or OC1B on compare match, set OC1A or OC1B at BOTTOM.</para></listitem> -<listitem><para>1 for inverted output i.e Set OC1A or OC1B on compare match, clear OC1A or OC1B at BOTTOM.</para></listitem> -For CTC Mode: -<listitem><para>0 to Clear OC1A or OC1B on compare match</para></listitem> -<listitem><para>1 to Set OC1A or OC1B on compare match</para></listitem> -<listitem><para>2 to toggle OC1A or OC1B on compare match</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -Example -AVRPWM1Setup(2,0,0); //This function will select CTC mode and will clear OC1A or OC1B -on compare match.Also as defined the output will be produced at -0C1A pin. -</para> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM1SetDuty">AVRPWM1SetDuty</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM2SetDuty.xml b/2.3-1/help/en_US/AVRPWM2SetDuty.xml deleted file mode 100644 index d44f0f71..00000000 --- a/2.3-1/help/en_US/AVRPWM2SetDuty.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM2SetDuty.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM2SetDuty" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM2SetDuty</refname> - <refpurpose>Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>duty :</term> - <listitem><para> It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.In this function by varying the duty cycle, varying voltage can be -produced. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -Example -AVRPWM2SetDuty(50); //Produces 2.5V at OC2 pin -AVRPWM2SetDuty(0); //Produces 0V at OC2 pin - </para> - <para> -</para> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM2Setup">AVRPWM2Setup</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRPWM2Setup.xml b/2.3-1/help/en_US/AVRPWM2Setup.xml deleted file mode 100644 index fe802522..00000000 --- a/2.3-1/help/en_US/AVRPWM2Setup.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRPWM2Setup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRPWM2Setup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRPWM2Setup</refname> - <refpurpose>Function to Setup OC2 pin for required PWM mode</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>waveform_mode:</term> - <listitem><para> integer, from 0 to 2</para></listitem></varlistentry> - <varlistentry><term>output_mode:</term> - <listitem><para> integer, from 0 to 1 (or 2) depending on the waveform_mode</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC2 pin to produces required -output waveform by setting the waveform mode and otput mode. - </para> - <para> -waveform_mode can take values- -<itemizedlist> -<listitem><para>0 -> for Phase correct PWM Mode</para></listitem> -<listitem><para>1 -> for Fast PWM Mode</para></listitem> -<listitem><para>2 -> for CTC Mode</para></listitem> -</itemizedlist> - </para> - <para> -output_mode can take values- -<itemizedlist> -For Phase correct PWM Mode: -<listitem><para>0 for Clear OC2 on compare match when up-counting. Set OC2 on compare match when down-counting.</para></listitem> -<listitem><para>1 for Set OC2 on compare match when up-counting. Clear OC2 on compare match when down-counting.</para></listitem> -For Fast PWM Mode: -<listitem><para>0 for non-inverted output i.e Clear OC2 on compare match, set OC2 at BOTTOM.</para></listitem> -<listitem><para>1 for inverted output i.e Set OC2 on compare match, clear OC2 at BOTTOM.</para></listitem> -For CTC Mode: -<listitem><para>0 to Clear OC2 on compare match</para></listitem> -<listitem><para>1 to Set OC2 on compare match</para></listitem> -<listitem><para>2 to toggle OC2 on compare match</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -Example -AVRPWM2Setup(2,0); //This function will select CTC waveform mode and will clear OC2 on -compare match -</para> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRPWM2SetDuty">AVRPWM2SetDuty</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRReadADC.xml b/2.3-1/help/en_US/AVRReadADC.xml deleted file mode 100644 index abdcad9a..00000000 --- a/2.3-1/help/en_US/AVRReadADC.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRReadADC.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRReadADC" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRReadADC</refname> - <refpurpose>Function to get voltage on analog pin on AVR</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - u8AVRReadADCs(channel) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>channel :</term> - <listitem><para> Select which channel is to be read. Values from 0-7 select one of the pins ADC0-ADC7. For other possible channel values refer datasheet</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function returns digital value for present on adc pins. 'channel' -selects which of the ADC0-ADC7 is to be used for reading analog value. -Apart from reading just ADC0-ADC7 other it can also read differential -voltages between some pins. For channel values for those options, please -refer datasheet. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -adc_result = u8AVRReadADC(0) //Read ADC0 - ]]></programlisting> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRSleep.xml b/2.3-1/help/en_US/AVRSleep.xml deleted file mode 100644 index 3ece53b8..00000000 --- a/2.3-1/help/en_US/AVRSleep.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRSleep.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRSleep" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRSleep</refname> - <refpurpose>Function to pause the execution for the given time.</refpurpose> - </refnamediv> - - -<refsection> - <title>Description</title> - <para> -This function causes the execution to stop for the given amount of time. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRSleep(5000); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Jorawar Singh</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRTimerSetup.xml b/2.3-1/help/en_US/AVRTimerSetup.xml deleted file mode 100644 index 420e6767..00000000 --- a/2.3-1/help/en_US/AVRTimerSetup.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRTimerSetup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRTimerSetup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRTimerSetup</refname> - <refpurpose>Function to setup Timers in ATmega16</refpurpose> - </refnamediv> - - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRGetTimerValues">AVRGetTimerValues</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRUARTReceive.xml b/2.3-1/help/en_US/AVRUARTReceive.xml deleted file mode 100644 index 84f9510e..00000000 --- a/2.3-1/help/en_US/AVRUARTReceive.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRUARTReceive.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRUARTReceive" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRUARTReceive</refname> - <refpurpose>Function to Receive Char value send to ATmega16 using UART or USART.</refpurpose> - </refnamediv> - - -<refsection> - <title>Description</title> - <para> -This function Receives Char as 8 bit value.This value is stored in UDR at receiving -end. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -state = AVRUARTReceive(); //This function will Receive char and return the entire value - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRUARTSetup">AVRUARTSetup</link></member> - <member><link linkend="AVRUARTTransmit">AVRUARTTransmit</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRUARTSetup.xml b/2.3-1/help/en_US/AVRUARTSetup.xml deleted file mode 100644 index 043e2652..00000000 --- a/2.3-1/help/en_US/AVRUARTSetup.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRUARTSetup.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRUARTSetup" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRUARTSetup</refname> - <refpurpose>Function to Setup Serial Communication i.e UART or USART in ATmega16.</refpurpose> - </refnamediv> - - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>mode :</term> - <listitem><para> integer, from 0 to 2</para></listitem></varlistentry> - <varlistentry><term>baudrate :</term> - <listitem><para> Enter one of the following available baudrates (2400 , 4800 , 9600 , 14400 , 19200 , 28800 , 38400 , 57600 , 768000 , 115200 , 230400 , 250000 , 1000000)</para></listitem></varlistentry> - <varlistentry><term>stopbits :</term> - <listitem><para> integer, (0 for one stopbit) or (1 for two stopbits)</para></listitem></varlistentry> - <varlistentry><term>parity :</term> - <listitem><para> integer, from 0 to 2</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function Setup the UART or USART for Serial Communicaion between ATmega16 -and different micro controllers or between ATmega16 and Computer. - </para> - <para> -mode can take values: -<itemizedlist> -<listitem><para>0 for Asynchronous Normal mode</para></listitem> -<listitem><para>1 for Asynchronous Double Speed mode</para></listitem> -<listitem><para>2 for Synchronous mode</para></listitem> -</itemizedlist> - </para> - <para> -parity can take values: -<itemizedlist> -<listitem><para>0 for parity disabled</para></listitem> -<listitem><para>1 for even parity</para></listitem> -<listitem><para>2 for odd parity</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRUARTSetup(0,9600,0,0); //This function will enable UART Communication for ATmega16 -with 9600 as baudrate,one stop bit and parity disabled - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRUARTTransmit">AVRUARTTransmit</link></member> - <member><link linkend="AVRUARTReceive">AVRUARTReceive</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/AVRUARTTransmit.xml b/2.3-1/help/en_US/AVRUARTTransmit.xml deleted file mode 100644 index e30e374b..00000000 --- a/2.3-1/help/en_US/AVRUARTTransmit.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from AVRUARTTransmit.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="AVRUARTTransmit" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>AVRUARTTransmit</refname> - <refpurpose>Function to Transmit data using UART or USART.</refpurpose> - </refnamediv> - - -<refsection> - <title>Description</title> - <para> -This function Tranmits data over UART or USART.The data to be transmitted can -be a Char , String , Unsigned Int, Signed Int. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR. - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -AVRUARTTransmit("This is example"); //This function will transmit the entered string. - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="AVRUARTSetup">AVRUARTSetup</link></member> - <member><link linkend="AVRUARTReceive">AVRUARTReceive</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Ashish Kamble</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_AdaptiveThreshold.xml b/2.3-1/help/en_US/CV_AdaptiveThreshold.xml deleted file mode 100644 index 1483442a..00000000 --- a/2.3-1/help/en_US/CV_AdaptiveThreshold.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_AdaptiveThreshold.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_AdaptiveThreshold" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_AdaptiveThreshold</refname> - <refpurpose>function to adaptively threshold input image</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - dst = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_type,blk_size,c) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>src :</term> - <listitem><para> Source 8-bit single-channel image.</para></listitem></varlistentry> - <varlistentry><term>max_value :</term> - <listitem><para> Non-zero value assigned to the pixels for which the condition is satisfied. See the details below.</para></listitem></varlistentry> - <varlistentry><term>adaptive_method :</term> - <listitem><para> Adaptive thresholding algorithm to use, ADAPTIVE_THRESH_MEAN_C or ADAPTIVE_THRESH_GAUSSIAN_C .</para></listitem></varlistentry> - <varlistentry><term>thresh_type :</term> - <listitem><para> Thresholding type that must be either THRESH_BINARY or THRESH_BINARY_INV .</para></listitem></varlistentry> - <varlistentry><term>blockSize :</term> - <listitem><para> Size of a pixel neighborhood that is used to calculate a threshold value for the pixel: 3, 5, 7, and so on.</para></listitem></varlistentry> - <varlistentry><term>C :</term> - <listitem><para> Constant subtracted from the mean or weighted mean.Normally, it is positive but may be zero or negative as well.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for adaptively threshold given image - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_AdaptiveThreshold(img,255,"ADAPTIVE_THRESH_MEAN_C", ... -"THRESH_BINARY",5,0) - - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_Blur.xml b/2.3-1/help/en_US/CV_Blur.xml deleted file mode 100644 index 228b3107..00000000 --- a/2.3-1/help/en_US/CV_Blur.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_Blur.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_Blur" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_Blur</refname> - <refpurpose>function to blur image using normalised box filter</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,border_type) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg :</term> - <listitem><para> Source image.</para></listitem></varlistentry> - <varlistentry><term>ksize_width, ksize_height :</term> - <listitem><para> blurring kernel size.</para></listitem></varlistentry> - <varlistentry><term>anchor_x, anchor_y :</term> - <listitem><para> x,y coordinates of anchor point</para></listitem></varlistentry> - <varlistentry><term>border_type :</term> - <listitem><para> border mode used to extrapolate pixels outside of the image.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for blurring image using normalised box -filter. Image can be of any depth and have any no of channels. - </para> - <para> -border_type can be : -<itemizedlist> -<listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> -<listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> -<listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> -<listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> -<listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_Blur(img,3,3,-1,-1,"BORDER_CONSTANT") - - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_Threshold, CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_Canny.xml b/2.3-1/help/en_US/CV_Canny.xml deleted file mode 100644 index daf7f55b..00000000 --- a/2.3-1/help/en_US/CV_Canny.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_Canny.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_Canny" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_Canny</refname> - <refpurpose>Finds edges in image using Canny algorithm</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg :</term> - <listitem><para> single-channel 8-bit input image.</para></listitem></varlistentry> - <varlistentry><term>threshold1 :</term> - <listitem><para> first threshold for the hysteresis procedure.</para></listitem></varlistentry> - <varlistentry><term>threshold2 :</term> - <listitem><para> second threshold for the hysteresis procedure.</para></listitem></varlistentry> - <varlistentry><term>aperture_size :</term> - <listitem><para> aperture size for the Sobel() operator.</para></listitem></varlistentry> - <varlistentry><term>L2gradient :</term> - <listitem><para> a flag, indicating whether a more accurate</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for finding edes in single channel 8 bit -image. 'aperture_size' and 'L2gradient' are optionals. By default, -aperture_size is 3 and L2gradient is false. - </para> - <para> -For L2gradient: L_2 norm =sqrt{(dI/dx)^2 + (dI/dy)^2} should be used to calculate the image gradient magnitude (L2gradient=1 ), or whether the default L_1 norm =|dI/dx|+|dI/dy| is enough (L2gradient=0). - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_CvtColor(img,"CV_RGB2GRAY"); -edge = CV_Canny(dst,50,100,3,0); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_CornerHarris.xml b/2.3-1/help/en_US/CV_CornerHarris.xml deleted file mode 100644 index e9b94260..00000000 --- a/2.3-1/help/en_US/CV_CornerHarris.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_CornerHarris.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_CornerHarris" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_CornerHarris</refname> - <refpurpose>Finds edges in image using Harris algorithm</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg:</term> - <listitem><para> Input single-channel 8-bit or floating-point image.</para></listitem></varlistentry> - <varlistentry><term>blockSize:</term> - <listitem><para> Neighborhood size</para></listitem></varlistentry> - <varlistentry><term>ksize:</term> - <listitem><para> Aperture parameter for the Sobel() operator.</para></listitem></varlistentry> - <varlistentry><term>k:</term> - <listitem><para> Harris detector free parameter.</para></listitem></varlistentry> - <varlistentry><term>border_type:</term> - <listitem><para> border mode used to extrapolate pixels outside of the image.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -The function runs the Harris edge detector on the image. For each pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y) over a blockSize * blockSize neighborhood. Then, it computes the following characteristic: dst(x,y) = det(M(x,y)) - k .tr(M(x,y))^2. Corners in the image can be found as the local maxima of this response map. - </para> - <para> -border_type can be : -<itemizedlist> -<listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> -<listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> -<listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> -<listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> -<listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_CvtColor(img,"CV_RGB2GRAY"); -edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE"); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_CreateImage.xml b/2.3-1/help/en_US/CV_CreateImage.xml deleted file mode 100644 index 45fde568..00000000 --- a/2.3-1/help/en_US/CV_CreateImage.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_CreateImage.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_CreateImage" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_CreateImage</refname> - <refpurpose>function to create an image object of given size and type</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_CreateImage(image_size,bit_depth,no_of_channels) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>image_size:</term> - <listitem><para> width and height of image</para></listitem></varlistentry> - <varlistentry><term>bit_depth:</term> - <listitem><para> Bit depth of image elements</para></listitem></varlistentry> - <varlistentry><term>no_of_channels:</term> - <listitem><para> no of channels per pixels</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used to create opencv image object. For more info about bit depth and channels,please refer to OpenCV documentation - </para> - <para> -This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -CV_CreateImage([320 240], "IPL_DEPTH_8U", 1) //to create image of the size 320*240 pixels with 8 bit unsigned each pixels and gray scale image - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_LoadImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_CvtColor.xml b/2.3-1/help/en_US/CV_CvtColor.xml deleted file mode 100644 index f1f25e0e..00000000 --- a/2.3-1/help/en_US/CV_CvtColor.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_CvtColor.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_CvtColor" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_CvtColor</refname> - <refpurpose>function to convert image from one colorspace to other colorspace</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_CvtColor(srcimg,code) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg:</term> - <listitem><para> source image to be converted</para></listitem></varlistentry> - <varlistentry><term>dstimg:</term> - <listitem><para> destination image in which to store converted image</para></listitem></varlistentry> - <varlistentry><term>code:</term> - <listitem><para> String specifying conversion type. Same as defined in OpenCV. for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image</para></listitem></varlistentry> - <varlistentry><term>dstCn:</term> - <listitem><para> no of channels in destination image (0 by default)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for converting an image to other colorspace. -Refer OpenCV documentation for list of available conversions - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_CvtColor(img,'CV_RGB2GRAY') - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_Dilate.xml b/2.3-1/help/en_US/CV_Dilate.xml deleted file mode 100644 index d01b3ab7..00000000 --- a/2.3-1/help/en_US/CV_Dilate.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_Dilate.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_Dilate" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_Dilate</refname> - <refpurpose>dilates an image by using a specific structuring element.</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,[iterations,border_type,border_value]) - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>src :</term> - <listitem><para> input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.</para></listitem></varlistentry> - <varlistentry><term>dilation_type :</term> - <listitem><para> can be one of MORPH_RECT, MORPH_CROSS,MORPH_ELLIPSE</para></listitem></varlistentry> - <varlistentry><term>dilation_size :</term> - <listitem><para> size of kernel to be used for erosion. Must be odd</para></listitem></varlistentry> - <varlistentry><term>iterations :</term> - <listitem><para> number of times erosion is applied.</para></listitem></varlistentry> - <varlistentry><term>border_type :</term> - <listitem><para> pixel extrapolation method.</para></listitem></varlistentry> - <varlistentry><term>border_value :</term> - <listitem><para> border value in case of a constant border</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets. - </para> - <para> -border_type can be : -<itemizedlist> -<listitem><para> BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh </para></listitem> -<listitem><para> BORDER_REFLECT: fedcba|abcdefgh|hgfedcb </para></listitem> -<listitem><para> BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba </para></listitem> -<listitem><para> BORDER_WRAP: cdefgh|abcdefgh|abcdefg </para></listitem> -<listitem><para> BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii </para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_Erode</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_DistanceTransform.xml b/2.3-1/help/en_US/CV_DistanceTransform.xml deleted file mode 100644 index 07929993..00000000 --- a/2.3-1/help/en_US/CV_DistanceTransform.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_DistanceTransform.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_DistanceTransform" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_DistanceTransform</refname> - <refpurpose>function to calculate distance to closest zero pixels for each pixel</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - dst = CV_DistanceTransform(srcimg,distance_type,mask_size) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg :</term> - <listitem><para> Source 8-bit single-channel image.</para></listitem></varlistentry> - <varlistentry><term>distance_type :</term> - <listitem><para> Type of distance. It can be CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C</para></listitem></varlistentry> - <varlistentry><term>mask_size :</term> - <listitem><para> Size of the distance transform mask</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used to calculate distance to closest zero pixel for each pixel of the source image. Output is 32 bit floatingpoint, single channel image of the same size as that of source image. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_DistanceTransform(img,"CV_DIST_L1",3) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_Erode.xml b/2.3-1/help/en_US/CV_Erode.xml deleted file mode 100644 index 103d4899..00000000 --- a/2.3-1/help/en_US/CV_Erode.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_Erode.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_Erode" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_Erode</refname> - <refpurpose>Erodes an image by using a specific structuring element.</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,[iterations,border_type,border_value]) - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>src :</term> - <listitem><para> input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.</para></listitem></varlistentry> - <varlistentry><term>erosion_type :</term> - <listitem><para> can be one of : MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE</para></listitem></varlistentry> - <varlistentry><term>erosion_size :</term> - <listitem><para> size of kernel to be used for erosion. Must be odd</para></listitem></varlistentry> - <varlistentry><term>iterations :</term> - <listitem><para> number of times erosion is applied.</para></listitem></varlistentry> - <varlistentry><term>border_type :</term> - <listitem><para> pixel extrapolation method.</para></listitem></varlistentry> - <varlistentry><term>border_value :</term> - <listitem><para> border value in case of a constant border</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets. - </para> - <para> -border_type can be : -<itemizedlist> -<listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> -<listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> -<listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> -<listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> -<listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_Dilate</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_GaussianBlur.xml b/2.3-1/help/en_US/CV_GaussianBlur.xml deleted file mode 100644 index 88a8f33c..00000000 --- a/2.3-1/help/en_US/CV_GaussianBlur.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_GaussianBlur.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_GaussianBlur" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_GaussianBlur</refname> - <refpurpose>function to blur image using gaussian filter</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y,border_type) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg :</term> - <listitem><para> Source image.</para></listitem></varlistentry> - <varlistentry><term>ksize_width, ksize_height :</term> - <listitem><para> blurring kernel size. must be odd.</para></listitem></varlistentry> - <varlistentry><term>sigmaX :</term> - <listitem><para> Gaussian kernel standard deviation in X direction.</para></listitem></varlistentry> - <varlistentry><term>sigmaY :</term> - <listitem><para> Gaussian kernel standard deviation in Y direction;</para></listitem></varlistentry> - <varlistentry><term>border_type :</term> - <listitem><para> border mode used to extrapolate pixels outside of the image.</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for blurring image using gaussian filter. Image can be of any depth and have any no of channels. - </para> - <para> -For sigmaX and sigmaY : if sigmaY is zero, it is set to be equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height , respectively. - </para> - <para> -border_type can be : -<itemizedlist> -<listitem>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</listitem> -<listitem>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</listitem> -<listitem>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</listitem> -<listitem>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</listitem> -<listitem>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT") - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_Blur, CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_GetImgSize.xml b/2.3-1/help/en_US/CV_GetImgSize.xml deleted file mode 100644 index 717c8086..00000000 --- a/2.3-1/help/en_US/CV_GetImgSize.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_GetImgSize.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_GetImgSize" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_GetImgSize</refname> - <refpurpose>function to get size of the image (width*height)</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_GetImgSize(img) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>img:</term> - <listitem><para> image whose size is to be returned</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for retriving size information of the image. -It returs an array with first image element as width and second as height - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -size = CV_GetImgSize(img) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_LoadImage.xml b/2.3-1/help/en_US/CV_LoadImage.xml deleted file mode 100644 index 70f55c82..00000000 --- a/2.3-1/help/en_US/CV_LoadImage.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_LoadImage.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_LoadImage" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_LoadImage</refname> - <refpurpose>function to load an image object from given filename</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_LoadImage(filename,loadtype) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>filename:</term> - <listitem><para> name of file to be opened</para></listitem></varlistentry> - <varlistentry><term>loadtype:</term> - <listitem><para> desired load method</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for loading a previously stored image - </para> - <para> -loadtype can take the following values: -<itemizedlist> -<listitem><para> less than 0 -> image is loaded as is (with alpha channel)</para></listitem> -<listitem><para> 0 -> image is loaded as greyscale</para></listitem> -<listitem><para> greater than 0 -> 3 channel color image is loaded</para></listitem> -</itemizedlist> - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -CV_LoadImage('~/test.jpg',0) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_CreateImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_MedianBlur.xml b/2.3-1/help/en_US/CV_MedianBlur.xml deleted file mode 100644 index d10291ca..00000000 --- a/2.3-1/help/en_US/CV_MedianBlur.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_MedianBlur.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_MedianBlur" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_MedianBlur</refname> - <refpurpose>function to blur image using median filter</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - cvtimg = CV_MedianBlur(srcimg,ksize) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg :</term> - <listitem><para> input 1-, 3-, or 4-channel image; when ksize is 3 or 5, the image depth should be CV_8U, CV_16U, or CV_32F, for larger aperture sizes, it can only be CV_8U.</para></listitem></varlistentry> - <varlistentry><term>ksize_width :</term> - <listitem><para> aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for blurring image using median -filter. Image can be of any depth and have any no of channels. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_MedianBlur(img,3) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_GaussianBlur,">CV_Blur, CV_CvtColor</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_SaveImage.xml b/2.3-1/help/en_US/CV_SaveImage.xml deleted file mode 100644 index 9e73200f..00000000 --- a/2.3-1/help/en_US/CV_SaveImage.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_SaveImage.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_SaveImage" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_SaveImage</refname> - <refpurpose>function to save an image object as a given filename</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_SaveImage(filename,img) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>filename:</term> - <listitem><para> name of file image to be saved as</para></listitem></varlistentry> - <varlistentry><term>img:</term> - <listitem><para> image to be saved</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for saving image. File format is detected -from file extension - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -CV_SaveImage('test1.png',img) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_ShowImage.xml b/2.3-1/help/en_US/CV_ShowImage.xml deleted file mode 100644 index e3f6e674..00000000 --- a/2.3-1/help/en_US/CV_ShowImage.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_ShowImage.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_ShowImage" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_ShowImage</refname> - <refpurpose>function to show an image</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_ShowImage(img) - CV_ShowImage(winname,img) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>winname:</term> - <listitem><para> name of window in which img is to be shown</para></listitem></varlistentry> - <varlistentry><term>img:</term> - <listitem><para> image to be shown already acquired (from file/camera)</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for showing images - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -CV_ShowImage(img) - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_CreateImage">CV_LoadImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_Threshold.xml b/2.3-1/help/en_US/CV_Threshold.xml deleted file mode 100644 index 0de0c145..00000000 --- a/2.3-1/help/en_US/CV_Threshold.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_Threshold.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_Threshold" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_Threshold</refname> - <refpurpose>function to threshold input image</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - dst = CV_Threshold(srcimg,code,threshold,max_value,thresh_type) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>srcimg:</term> - <listitem><para> source image to be converted</para></listitem></varlistentry> - <varlistentry><term>threshold:</term> - <listitem><para> threshold value</para></listitem></varlistentry> - <varlistentry><term>max_value:</term> - <listitem><para> maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV</para></listitem></varlistentry> - <varlistentry><term>thresh_type:</term> - <listitem><para> Type for threshold. It can one of the following: THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for converting an image to other colorspace. -Refer OpenCV documentation for list of available conversions - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -dst = CV_Threshold(img,100,255,'THRESH_BINARY') - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_CreateImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/CV_WaitKey.xml b/2.3-1/help/en_US/CV_WaitKey.xml deleted file mode 100644 index 9b527077..00000000 --- a/2.3-1/help/en_US/CV_WaitKey.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - * - * This help file was generated from CV_WaitKey.sci using help_from_sci(). - * - --> - -<refentry version="5.0-subset Scilab" xml:id="CV_WaitKey" xml:lang="en" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:scilab="http://www.scilab.org" - xmlns:db="http://docbook.org/ns/docbook"> - - <refnamediv> - <refname>CV_WaitKey</refname> - <refpurpose>function similar to cvWaitKey</refpurpose> - </refnamediv> - - -<refsynopsisdiv> - <title>Calling Sequence</title> - <synopsis> - CV_WaitKey(delay) - - </synopsis> -</refsynopsisdiv> - -<refsection> - <title>Parameters</title> - <variablelist> - <varlistentry><term>delay:</term> - <listitem><para> waiting delay, if 0 then wait till keypress</para></listitem></varlistentry> - </variablelist> -</refsection> - -<refsection> - <title>Description</title> - <para> -This function can be used for inseting some delay. This function must -follow CV_ShowImage to display image. - </para> - <para> -This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV - </para> - <para> -</para> -</refsection> - -<refsection> - <title>Examples</title> - <programlisting role="example"><![CDATA[ -img = CV_LoadImage('~/test.jpg',0) -CV_ShowImage('',img) -CV_WaitKey(0); - ]]></programlisting> -</refsection> - -<refsection> - <title>See also</title> - <simplelist type="inline"> - <member><link linkend="CV_LoadImage">CV_ShowImage</link></member> - </simplelist> -</refsection> - -<refsection> - <title>Authors</title> - <simplelist type="vert"> - <member>Siddhesh Wani</member> - </simplelist> -</refsection> -</refentry> diff --git a/2.3-1/help/en_US/master_help.xml b/2.3-1/help/en_US/master_help.xml deleted file mode 100644 index 90e0f8d2..00000000 --- a/2.3-1/help/en_US/master_help.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book [ -<!--Begin Entities--> -<!ENTITY a45ff9a6852959b1a533849baff9131c0 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRADCSetup.xml"> -<!ENTITY aa535870c28cdae60e20522da4d040edf SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRDigitalIn.xml"> -<!ENTITY a7b357f4ea5dcfc83bd854d778bb430f8 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRDigitalOut.xml"> -<!ENTITY a044f46a6067058c19f94381c893a126c SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRDigitalPortSetup.xml"> -<!ENTITY a46f0585f7f884cc85ee697b9a7b684e3 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRDigitalSetup.xml"> -<!ENTITY ae277689fbe556195d10f3cf7b91a6249 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRGetTimerValue.xml"> -<!ENTITY a589e1300bf17ec9092564c9c2778ea6d SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM0SetDuty.xml"> -<!ENTITY a6e1e23a859268abaa4cda23edd48db26 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM0Setup.xml"> -<!ENTITY af36bcc614f777ae47a7d36300c39c3ed SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM1SetDuty.xml"> -<!ENTITY a174a3c3f824b709d128b677155856a30 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM1Setup.xml"> -<!ENTITY a59a8f3dd0aea835bffcdd26d255b05a5 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM2SetDuty.xml"> -<!ENTITY a65045ecd909e625cba31e7267b144b56 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRPWM2Setup.xml"> -<!ENTITY a40ac677c8b55c6bfa6cfcd7a81f046db SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRReadADC.xml"> -<!ENTITY a59ebb3d123e41d3896ad640cdc07744e SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRSleep.xml"> -<!ENTITY ad45dd5fbbfeb5adb284d65f52110c5d7 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRTimerSetup.xml"> -<!ENTITY adab54deec23a20dc384238025026cefc SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRUARTReceive.xml"> -<!ENTITY a286165071c98d9849467ecf03c10299f SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRUARTSetup.xml"> -<!ENTITY a1271cad4af17a89fbd333c70aa572959 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/AVRUARTTransmit.xml"> -<!ENTITY a3587ac9ce679f7f9ebed4cd2b465eb45 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_AdaptiveThreshold.xml"> -<!ENTITY a899c8caef8a80ad4ab494d9bc54b25fe SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_Blur.xml"> -<!ENTITY a8a81a8aa50590a5e4fe751cf4703a1ce SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_Canny.xml"> -<!ENTITY acef90ed956f606a535d7c56240044f01 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_CornerHarris.xml"> -<!ENTITY a56e8bdeda6841211b177581fcfab6432 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_CreateImage.xml"> -<!ENTITY a4e046d2f0e51a5080d88c9643e8e0ddb SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_CvtColor.xml"> -<!ENTITY a4208f720d40e4c450619dedb5a3dfad8 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_Dilate.xml"> -<!ENTITY a4a33c54f876a7394881deae0cf392901 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_DistanceTransform.xml"> -<!ENTITY ad1c438fb40230c7f1ae7d1b94c60eb18 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_Erode.xml"> -<!ENTITY a086e99d8570c59b8b45c2f95514fe7d1 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_GaussianBlur.xml"> -<!ENTITY aef6dd7d7c9b5939b3a3dac25e9656cad SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_GetImgSize.xml"> -<!ENTITY a93407fa91b64871ca4ee864d189b4cf3 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_LoadImage.xml"> -<!ENTITY afd0fae2216ddb355bde20422a15f187e SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_MedianBlur.xml"> -<!ENTITY a990f985e9ce47fd8a4195024bd72c52c SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_SaveImage.xml"> -<!ENTITY aaad233f1461f9874467c10aeb9000612 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_ShowImage.xml"> -<!ENTITY a7243090fad8f462f410bf471d164c068 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_Threshold.xml"> -<!ENTITY ae0a9a04582b5eddcda2ef2bb2855cb81 SYSTEM "/Data/Repos/Git/Git2/Scilab2C/2.3-1/help/en_US/CV_WaitKey.xml"> -<!--End Entities--> -]> -<book version="5.0-subset Scilab" xml:lang="en_US" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:mml="http://www.w3.org/1998/Math/MathML" - xmlns:html="http://www.w3.org/1999/xhtml" - xmlns:db="http://docbook.org/ns/docbook"> - <info xml:id='scilab_2_c_converter_manual'> - <title>Scilab 2 C Converter</title> - </info> - -<part xml:id='section_4d177ceb9ae128b1850140a7901a140a'> -<title>Scilab 2 C Converter</title> -&a45ff9a6852959b1a533849baff9131c0; -&aa535870c28cdae60e20522da4d040edf; -&a7b357f4ea5dcfc83bd854d778bb430f8; -&a044f46a6067058c19f94381c893a126c; -&a46f0585f7f884cc85ee697b9a7b684e3; -&ae277689fbe556195d10f3cf7b91a6249; -&a589e1300bf17ec9092564c9c2778ea6d; -&a6e1e23a859268abaa4cda23edd48db26; -&af36bcc614f777ae47a7d36300c39c3ed; -&a174a3c3f824b709d128b677155856a30; -&a59a8f3dd0aea835bffcdd26d255b05a5; -&a65045ecd909e625cba31e7267b144b56; -&a40ac677c8b55c6bfa6cfcd7a81f046db; -&a59ebb3d123e41d3896ad640cdc07744e; -&ad45dd5fbbfeb5adb284d65f52110c5d7; -&adab54deec23a20dc384238025026cefc; -&a286165071c98d9849467ecf03c10299f; -&a1271cad4af17a89fbd333c70aa572959; -&a3587ac9ce679f7f9ebed4cd2b465eb45; -&a899c8caef8a80ad4ab494d9bc54b25fe; -&a8a81a8aa50590a5e4fe751cf4703a1ce; -&acef90ed956f606a535d7c56240044f01; -&a56e8bdeda6841211b177581fcfab6432; -&a4e046d2f0e51a5080d88c9643e8e0ddb; -&a4208f720d40e4c450619dedb5a3dfad8; -&a4a33c54f876a7394881deae0cf392901; -&ad1c438fb40230c7f1ae7d1b94c60eb18; -&a086e99d8570c59b8b45c2f95514fe7d1; -&aef6dd7d7c9b5939b3a3dac25e9656cad; -&a93407fa91b64871ca4ee864d189b4cf3; -&afd0fae2216ddb355bde20422a15f187e; -&a990f985e9ce47fd8a4195024bd72c52c; -&aaad233f1461f9874467c10aeb9000612; -&a7243090fad8f462f410bf471d164c068; -&ae0a9a04582b5eddcda2ef2bb2855cb81; -</part> -</book> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRADCSetup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRADCSetup.html deleted file mode 100644 index 19d393b6..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRADCSetup.html +++ /dev/null @@ -1,88 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRADCSetup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="section_4d177ceb9ae128b1850140a7901a140a.html"><< Scilab 2 C Converter</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalIn.html">AVRDigitalIn >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRADCSetup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRADCSetup</h1> - <p class="refpurpose">Function to initialise ADC of AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">AVRADCSetup</span><span class="default">(</span><span class="default">uint8</span> <span class="default">prescaler</span><span class="default">, </span><span class="default">uint8</span> <span class="default">adc_ref</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">prescaler:</span> - <dd><p class="para">prescaler to be used for generating ADC clock (0-7)</p></dd></dt> - <dt><span class="term">adc_ref :</span> - <dd><p class="para">reference voltage to be used for ADC conversion</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function initialises ADc of AVR with given parameters. 'prescaler' is needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending on MCU clock. 'adc_ref' selects one of the available reference voltage sources available.</p> - <p class="para">The adc_ref can take the following values- -<ul class="itemizedlist"><li><p class="para">0 -> Voltage on VREF pin</p></li> -<li><p class="para">1 -> Voltage on AVCC pin</p></li> -<li><p class="para">2 -> Internal 2.56 reference voltage</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRADCSetup</span><span class="scilabopenclose">(</span><span class="scilabnumber">128</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRReadADC.html" class="link">AVRReadADC</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="section_4d177ceb9ae128b1850140a7901a140a.html"><< Scilab 2 C Converter</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalIn.html">AVRDigitalIn >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalIn.html b/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalIn.html deleted file mode 100644 index 40592ccd..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalIn.html +++ /dev/null @@ -1,88 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRDigitalIn</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRADCSetup.html"><< AVRADCSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalOut.html">AVRDigitalOut >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRDigitalIn</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRDigitalIn</h1> - <p class="refpurpose">Function to get state (high\low) of a digital input pin on AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">state</span><span class="default">=</span><span class="functionid">AVRDigitalIn</span><span class="default">(</span><span class="default">port</span><span class="default">,</span><span class="default">pin</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">port :</span> - <dd><p class="para">port of microcontroller to be used</p></dd></dt> - <dt><span class="term">pin :</span> - <dd><p class="para">pin of port (mentioned above) to be used</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each AVR microcontroller has pins which can be configured as digital -inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port as -digital input.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">pinA0</span> <span class="scilaboperator">=</span> <span class="scilabid">AVRDigitalIn</span><span class="scilabopenclose">(</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> <span class="scilabcomment">//To read state on pin 0 of port A</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRDigitalOut.html" class="link">AVRDigitalSetup</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRADCSetup.html"><< AVRADCSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalOut.html">AVRDigitalOut >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalOut.html b/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalOut.html deleted file mode 100644 index ba1f71d1..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalOut.html +++ /dev/null @@ -1,91 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRDigitalOut</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalIn.html"><< AVRDigitalIn</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalPortSetup.html">AVRDigitalPortSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRDigitalOut</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRDigitalOut</h1> - <p class="refpurpose">Function to change state (high\low) of a digital output pin on AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">AVRDigitalOut</span><span class="default">(</span><span class="default">port</span><span class="default">,</span><span class="default">pin</span><span class="default">,</span><span class="default">state</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">port :</span> - <dd><p class="para">port of microcontroller to be used</p></dd></dt> - <dt><span class="term">pin :</span> - <dd><p class="para">pin of port (mentioned above) to be used</p></dd></dt> - <dt><span class="term">state :</span> - <dd><p class="para">state to be outputed on pin (HIGH\LOW)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each AVR microcontroller has pins which can be configured as digital -outputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port as -digital output. Also, desired output state must be specified as -'HIGH' or 'LOW'.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRDigitalOut</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">A</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabid">HIGH</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRDigitalIn.html" class="link">AVRDigitalIn</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalIn.html"><< AVRDigitalIn</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalPortSetup.html">AVRDigitalPortSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalPortSetup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalPortSetup.html deleted file mode 100644 index 6ff374c9..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalPortSetup.html +++ /dev/null @@ -1,89 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRDigitalPortSetup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalOut.html"><< AVRDigitalOut</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalSetup.html">AVRDigitalSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRDigitalPortSetup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRDigitalPortSetup</h1> - <p class="refpurpose">Function to decide direction of port on AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">AVRDigitalPortSetup</span><span class="default">(</span><span class="default">port</span><span class="default">,</span><span class="default">direction</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">port :</span> - <dd><p class="para">port of microcontroller to be used(1 for PORTA, 2 for PORTB,...)</p></dd></dt> - <dt><span class="term">direction :</span> - <dd><p class="para">direction to be set for pin (0 for INPUT, 1 for OUTPUT)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each AVR microcontroller has pins which can be configured as digital -outputs/inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port to be -used as digital output/input. Also, desired direction must be specified as -'INPUT' or 'OUTPUT'.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRDigitalPortSetup</span><span class="scilabopenclose">(</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//This function will make PortA as input port</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRDigitalIn.html" class="link">AVRDigitalOut</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalOut.html"><< AVRDigitalOut</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRDigitalSetup.html">AVRDigitalSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalSetup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalSetup.html deleted file mode 100644 index 64142d3b..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRDigitalSetup.html +++ /dev/null @@ -1,91 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRDigitalSetup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalPortSetup.html"><< AVRDigitalPortSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRGetTimerValue.html">AVRGetTimerValue >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRDigitalSetup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRDigitalSetup</h1> - <p class="refpurpose">Function to decide direction of a digital pin on AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">AVRDigitalSetup</span><span class="default">(</span><span class="default">port</span><span class="default">,</span><span class="default">pin</span><span class="default">,</span><span class="default">direction</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">port :</span> - <dd><p class="para">port of microcontroller to be used</p></dd></dt> - <dt><span class="term">pin :</span> - <dd><p class="para">pin of port (mentioned above) to be used</p></dd></dt> - <dt><span class="term">direction :</span> - <dd><p class="para">direction to be set for pin (INPUT\OUTPUT)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each AVR microcontroller has pins which can be configured as digital -outputs/inputs. These are normally divided among some 'ports' (group of pins). -User has to select one of these port and which pin of that port to be -used as digital output/input. Also, desired direction must be specified as -'INPUT' or 'OUTPUT'.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRDigitalSetup</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">A</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabid">OUTPUT</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRDigitalIn.html" class="link">AVRDigitalOut</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalPortSetup.html"><< AVRDigitalPortSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRGetTimerValue.html">AVRGetTimerValue >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRGetTimerValue.html b/2.3-1/help/en_US/scilab_en_US_help/AVRGetTimerValue.html deleted file mode 100644 index ae75314c..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRGetTimerValue.html +++ /dev/null @@ -1,83 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRGetTimerValue</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalSetup.html"><< AVRDigitalSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM0SetDuty.html">AVRPWM0SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRGetTimerValue</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRGetTimerValue</h1> - <p class="refpurpose">Function to get timer count</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">timer :</span> - <dd><p class="para">timer whose current count is to be returned</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function returns the count value of a desired timer.By knowing the count value certain interrupt action can be taken.</p> - <p class="para">Timer can take the following values -<ul class="itemizedlist"><li><p class="para">0 -> for timer0</p></li> -<li><p class="para">1 -> for timer1</p></li> -<li><p class="para">2 -> for timer2</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRGetTimerValue</span><span class="scilabopenclose">(</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//returns present count of the TCNT0 counter</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRTimerSetup.html" class="link">AVRTimerSetup</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRDigitalSetup.html"><< AVRDigitalSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM0SetDuty.html">AVRPWM0SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0SetDuty.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0SetDuty.html deleted file mode 100644 index d8a29b07..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0SetDuty.html +++ /dev/null @@ -1,80 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM0SetDuty</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRGetTimerValue.html"><< AVRGetTimerValue</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM0Setup.html">AVRPWM0Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM0SetDuty</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM0SetDuty</h1> - <p class="refpurpose">Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">duty :</span> - <dd><p class="para">It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.In this function by varying the duty cycle, varying voltage can be produced.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRPWM0SetDuty</span><span class="scilabopenclose">(</span><span class="scilabnumber">50</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//Produces 2.5V at OC0 pin</span> -<span class="scilabid">AVRPWM0SetDuty</span><span class="scilabopenclose">(</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//Produces 0V at OC0 pin</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM0Setup.html" class="link">AVRPWM0Setup</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRGetTimerValue.html"><< AVRGetTimerValue</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM0Setup.html">AVRPWM0Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0Setup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0Setup.html deleted file mode 100644 index 45306664..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM0Setup.html +++ /dev/null @@ -1,98 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM0Setup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM0SetDuty.html"><< AVRPWM0SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM1SetDuty.html">AVRPWM1SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM0Setup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM0Setup</h1> - <p class="refpurpose">Function to Setup OC0 pin for required PWM mode</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">waveform_mode:</span> - <dd><p class="para">integer, from 0 to 2</p></dd></dt> - <dt><span class="term">output_mode:</span> - <dd><p class="para">integer, from 0 to 1 (or 2) depending on the waveform_mode</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC0 pin to produce required -output waveform by setting the waveform mode and otput mode.</p> - <p class="para">waveform_mode can take values- -<ul class="itemizedlist"><li><p class="para">0 -> for Phase correct PWM Mode</p></li> -<li><p class="para">1 -> for Fast PWM Mode</p></li> -<li><p class="para">2 -> for CTC Mode</p></li></ul></p> - <p class="para">output_mode can take values- -<ul class="itemizedlist">For Phase correct PWM Mode: -<li><p class="para">0 for Clear OC0 on compare match when up-counting. Set OC0 on compare match when down-counting.</p></li> -<li><p class="para">1 for Set OC0 on compare match when up-counting. Clear OC0 on compare match when down-counting.</p></li> -For Fast PWM Mode: -<li><p class="para">0 for non-inverted output i.e Clear OC0 on compare match, set OC0 at BOTTOM.</p></li> -<li><p class="para">1 for inverted output i.e Set OC0 on compare match, clear OC0 at BOTTOM.</p></li> -For CTC Mode: -<li><p class="para">0 to Clear OC0 on compare match</p></li> -<li><p class="para">1 to Set OC0 on compare match</p></li> -<li><p class="para">2 to toggle OC0 on compare match</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRPWM0Setup</span><span class="scilabopenclose">(</span><span class="scilabnumber">2</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//This function will select CTC waveform mode and will clear OC0 on compare match</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM0SetDuty.html" class="link">AVRPWM0SetDuty</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM0SetDuty.html"><< AVRPWM0SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM1SetDuty.html">AVRPWM1SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1SetDuty.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1SetDuty.html deleted file mode 100644 index 44649890..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1SetDuty.html +++ /dev/null @@ -1,83 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM1SetDuty</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM0Setup.html"><< AVRPWM0Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM1Setup.html">AVRPWM1Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM1SetDuty</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM1SetDuty</h1> - <p class="refpurpose">Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">ouput_pin:</span> - <dd><p class="para">integer, 0 (for OC1A) or 1 (for OC1B)</p></dd></dt> - <dt><span class="term">duty:</span> - <dd><p class="para">It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</p></dd></dt> - <dt><span class="term">Top_Value:</span> - <dd><p class="para">It holds an integer value from 0 to 65535.This value sets the Top value of the counter TCNT1 i.e ICR.(for more info refer datasheet)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.This function Sets the duty cycle of output PWM signal.Also this function -decides the Top Vale of TCNT1 and the output pin to output PWM signal.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para">Example -AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty cycle on OC1A pin and TCNT1 will reset at 40000 instead at 65535.</p></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM1Setup.html" class="link">AVRPWM1Setup</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM0Setup.html"><< AVRPWM0Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM1Setup.html">AVRPWM1Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1Setup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1Setup.html deleted file mode 100644 index dc8169af..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM1Setup.html +++ /dev/null @@ -1,100 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM1Setup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM1SetDuty.html"><< AVRPWM1SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM2SetDuty.html">AVRPWM2SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM1Setup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM1Setup</h1> - <p class="refpurpose">Function to Setup OC1A or OC1B pin for required PWM mode</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">waveform_mode:</span> - <dd><p class="para">integer, from 0 to 2</p></dd></dt> - <dt><span class="term">output_mode:</span> - <dd><p class="para">integer, from 0 to 1 (or 2) depending on the waveform_mode</p></dd></dt> - <dt><span class="term">output_pin:</span> - <dd><p class="para">0 (for OC1A) or 1 for (OC1B)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC1A or OC1B pin to produces required -output waveform by setting the waveform mode and otput mode.</p> - <p class="para">waveform_mode can take values- -<ul class="itemizedlist"><li><p class="para">0 -> for Phase correct PWM Mode</p></li> -<li><p class="para">1 -> for Fast PWM Mode</p></li> -<li><p class="para">2 -> for CTC Mode</p></li></ul></p> - <p class="para">output_mode can take values- -<ul class="itemizedlist">For Phase correct PWM Mode: -<li><p class="para">0 for Clear OC1A or OC1B on compare match when up-counting. Set OC1A or OC1B on compare match when down-counting.</p></li> -<li><p class="para">1 for Set OC1A or OC1B on compare match when up-counting. Clear OC1A or OC1B on compare match when down-counting.</p></li> -For Fast PWM Mode: -<li><p class="para">0 for non-inverted output i.e Clear OC1A or OC1B on compare match, set OC1A or OC1B at BOTTOM.</p></li> -<li><p class="para">1 for inverted output i.e Set OC1A or OC1B on compare match, clear OC1A or OC1B at BOTTOM.</p></li> -For CTC Mode: -<li><p class="para">0 to Clear OC1A or OC1B on compare match</p></li> -<li><p class="para">1 to Set OC1A or OC1B on compare match</p></li> -<li><p class="para">2 to toggle OC1A or OC1B on compare match</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para">Example -AVRPWM1Setup(2,0,0); //This function will select CTC mode and will clear OC1A or OC1B -on compare match.Also as defined the output will be produced at -0C1A pin.</p></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM1SetDuty.html" class="link">AVRPWM1SetDuty</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM1SetDuty.html"><< AVRPWM1SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM2SetDuty.html">AVRPWM2SetDuty >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2SetDuty.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2SetDuty.html deleted file mode 100644 index be0c2251..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2SetDuty.html +++ /dev/null @@ -1,81 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM2SetDuty</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM1Setup.html"><< AVRPWM1Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM2Setup.html">AVRPWM2Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM2SetDuty</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM2SetDuty</h1> - <p class="refpurpose">Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">duty :</span> - <dd><p class="para">It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Each Micro controller has PWM output pins which can generate varying voltage -from 0V-5V.In this function by varying the duty cycle, varying voltage can be -produced.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para">Example -AVRPWM2SetDuty(50); //Produces 2.5V at OC2 pin -AVRPWM2SetDuty(0); //Produces 0V at OC2 pin</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM2Setup.html" class="link">AVRPWM2Setup</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM1Setup.html"><< AVRPWM1Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRPWM2Setup.html">AVRPWM2Setup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2Setup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2Setup.html deleted file mode 100644 index b6f116d8..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRPWM2Setup.html +++ /dev/null @@ -1,97 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRPWM2Setup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM2SetDuty.html"><< AVRPWM2SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRReadADC.html">AVRReadADC >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRPWM2Setup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRPWM2Setup</h1> - <p class="refpurpose">Function to Setup OC2 pin for required PWM mode</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">waveform_mode:</span> - <dd><p class="para">integer, from 0 to 2</p></dd></dt> - <dt><span class="term">output_mode:</span> - <dd><p class="para">integer, from 0 to 1 (or 2) depending on the waveform_mode</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">Every Micro controller has PWM pins which can generate varying voltages -from 0V-5V.This function helps to use OC2 pin to produces required -output waveform by setting the waveform mode and otput mode.</p> - <p class="para">waveform_mode can take values- -<ul class="itemizedlist"><li><p class="para">0 -> for Phase correct PWM Mode</p></li> -<li><p class="para">1 -> for Fast PWM Mode</p></li> -<li><p class="para">2 -> for CTC Mode</p></li></ul></p> - <p class="para">output_mode can take values- -<ul class="itemizedlist">For Phase correct PWM Mode: -<li><p class="para">0 for Clear OC2 on compare match when up-counting. Set OC2 on compare match when down-counting.</p></li> -<li><p class="para">1 for Set OC2 on compare match when up-counting. Clear OC2 on compare match when down-counting.</p></li> -For Fast PWM Mode: -<li><p class="para">0 for non-inverted output i.e Clear OC2 on compare match, set OC2 at BOTTOM.</p></li> -<li><p class="para">1 for inverted output i.e Set OC2 on compare match, clear OC2 at BOTTOM.</p></li> -For CTC Mode: -<li><p class="para">0 to Clear OC2 on compare match</p></li> -<li><p class="para">1 to Set OC2 on compare match</p></li> -<li><p class="para">2 to toggle OC2 on compare match</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para">Example -AVRPWM2Setup(2,0); //This function will select CTC waveform mode and will clear OC2 on -compare match</p></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRPWM2SetDuty.html" class="link">AVRPWM2SetDuty</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM2SetDuty.html"><< AVRPWM2SetDuty</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRReadADC.html">AVRReadADC >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRReadADC.html b/2.3-1/help/en_US/scilab_en_US_help/AVRReadADC.html deleted file mode 100644 index 5d009c98..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRReadADC.html +++ /dev/null @@ -1,84 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRReadADC</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM2Setup.html"><< AVRPWM2Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRSleep.html">AVRSleep >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRReadADC</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRReadADC</h1> - <p class="refpurpose">Function to get voltage on analog pin on AVR</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">u8AVRReadADCs</span><span class="default">(</span><span class="default">channel</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">channel :</span> - <dd><p class="para">Select which channel is to be read. Values from 0-7 select one of the pins ADC0-ADC7. For other possible channel values refer datasheet</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function returns digital value for present on adc pins. 'channel' -selects which of the ADC0-ADC7 is to be used for reading analog value. -Apart from reading just ADC0-ADC7 other it can also read differential -voltages between some pins. For channel values for those options, please -refer datasheet.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">adc_result</span> <span class="scilaboperator">=</span> <span class="scilabid">u8AVRReadADC</span><span class="scilabopenclose">(</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> <span class="scilabcomment">//Read ADC0</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li> - <li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRPWM2Setup.html"><< AVRPWM2Setup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRSleep.html">AVRSleep >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRSleep.html b/2.3-1/help/en_US/scilab_en_US_help/AVRSleep.html deleted file mode 100644 index 09372499..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRSleep.html +++ /dev/null @@ -1,75 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRSleep</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRReadADC.html"><< AVRReadADC</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRTimerSetup.html">AVRTimerSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRSleep</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRSleep</h1> - <p class="refpurpose">Function to pause the execution for the given time.</p></div> - - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function causes the execution to stop for the given amount of time.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRSleep</span><span class="scilabopenclose">(</span><span class="scilabnumber">5000</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Jorawar Singh</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRReadADC.html"><< AVRReadADC</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRTimerSetup.html">AVRTimerSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRTimerSetup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRTimerSetup.html deleted file mode 100644 index 6c78ecce..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRTimerSetup.html +++ /dev/null @@ -1,66 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRTimerSetup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRSleep.html"><< AVRSleep</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTReceive.html">AVRUARTReceive >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRTimerSetup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRTimerSetup</h1> - <p class="refpurpose">Function to setup Timers in ATmega16</p></div> - - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="scilab://AVRGetTimerValues" class="link">AVRGetTimerValues</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRSleep.html"><< AVRSleep</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTReceive.html">AVRUARTReceive >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTReceive.html b/2.3-1/help/en_US/scilab_en_US_help/AVRUARTReceive.html deleted file mode 100644 index 6c7347d3..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTReceive.html +++ /dev/null @@ -1,77 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRUARTReceive</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRTimerSetup.html"><< AVRTimerSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTSetup.html">AVRUARTSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRUARTReceive</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRUARTReceive</h1> - <p class="refpurpose">Function to Receive Char value send to ATmega16 using UART or USART.</p></div> - - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function Receives Char as 8 bit value.This value is stored in UDR at receiving -end.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">state</span> <span class="scilaboperator">=</span> <span class="scilabid">AVRUARTReceive</span><span class="scilabopenclose">(</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//This function will Receive char and return the entire value</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRUARTSetup.html" class="link">AVRUARTSetup</a></li> - <li class="member"><a href="AVRUARTTransmit.html" class="link">AVRUARTTransmit</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRTimerSetup.html"><< AVRTimerSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTSetup.html">AVRUARTSetup >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTSetup.html b/2.3-1/help/en_US/scilab_en_US_help/AVRUARTSetup.html deleted file mode 100644 index 6b3c98ac..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTSetup.html +++ /dev/null @@ -1,96 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRUARTSetup</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTReceive.html"><< AVRUARTReceive</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTTransmit.html">AVRUARTTransmit >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRUARTSetup</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRUARTSetup</h1> - <p class="refpurpose">Function to Setup Serial Communication i.e UART or USART in ATmega16.</p></div> - - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">mode :</span> - <dd><p class="para">integer, from 0 to 2</p></dd></dt> - <dt><span class="term">baudrate :</span> - <dd><p class="para">Enter one of the following available baudrates (2400 , 4800 , 9600 , 14400 , 19200 , 28800 , 38400 , 57600 , 768000 , 115200 , 230400 , 250000 , 1000000)</p></dd></dt> - <dt><span class="term">stopbits :</span> - <dd><p class="para">integer, (0 for one stopbit) or (1 for two stopbits)</p></dd></dt> - <dt><span class="term">parity :</span> - <dd><p class="para">integer, from 0 to 2</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function Setup the UART or USART for Serial Communicaion between ATmega16 -and different micro controllers or between ATmega16 and Computer.</p> - <p class="para">mode can take values: -<ul class="itemizedlist"><li><p class="para">0 for Asynchronous Normal mode</p></li> -<li><p class="para">1 for Asynchronous Double Speed mode</p></li> -<li><p class="para">2 for Synchronous mode</p></li></ul></p> - <p class="para">parity can take values: -<ul class="itemizedlist"><li><p class="para">0 for parity disabled</p></li> -<li><p class="para">1 for even parity</p></li> -<li><p class="para">2 for odd parity</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRUARTSetup</span><span class="scilabopenclose">(</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabnumber">9600</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//This function will enable UART Communication for ATmega16</span> -<span class="scilabid">with</span> <span class="scilabnumber">9600</span> <span class="scilabid">as</span> <span class="scilabid">baudrate</span><span class="scilabdefault">,</span><span class="scilabid">one</span> <span class="scilabid">stop</span> <span class="scilabid">bit</span> <a class="scilabcommand" href="scilab://and">and</a> <span class="scilabstring">parity</span> <span class="scilabstring">disabled</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRUARTTransmit.html" class="link">AVRUARTTransmit</a></li> - <li class="member"><a href="AVRUARTReceive.html" class="link">AVRUARTReceive</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTReceive.html"><< AVRUARTReceive</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="AVRUARTTransmit.html">AVRUARTTransmit >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTTransmit.html b/2.3-1/help/en_US/scilab_en_US_help/AVRUARTTransmit.html deleted file mode 100644 index 02baa9ab..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/AVRUARTTransmit.html +++ /dev/null @@ -1,77 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>AVRUARTTransmit</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTSetup.html"><< AVRUARTSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_AdaptiveThreshold.html">CV_AdaptiveThreshold >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > AVRUARTTransmit</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">AVRUARTTransmit</h1> - <p class="refpurpose">Function to Transmit data using UART or USART.</p></div> - - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function Tranmits data over UART or USART.The data to be transmitted can -be a Char , String , Unsigned Int, Signed Int.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for AVR.</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">AVRUARTTransmit</span><span class="scilabopenclose">(</span><span class="scilabstring">"</span><span class="scilabstring">This is example</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> <span class="scilabcomment">//This function will transmit the entered string.</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="AVRUARTSetup.html" class="link">AVRUARTSetup</a></li> - <li class="member"><a href="AVRUARTReceive.html" class="link">AVRUARTReceive</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Ashish Kamble</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTSetup.html"><< AVRUARTSetup</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_AdaptiveThreshold.html">CV_AdaptiveThreshold >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_AdaptiveThreshold.html b/2.3-1/help/en_US/scilab_en_US_help/CV_AdaptiveThreshold.html deleted file mode 100644 index c2273ae4..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_AdaptiveThreshold.html +++ /dev/null @@ -1,94 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_AdaptiveThreshold</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTTransmit.html"><< AVRUARTTransmit</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Blur.html">CV_Blur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_AdaptiveThreshold</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_AdaptiveThreshold</h1> - <p class="refpurpose">function to adaptively threshold input image</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">dst</span><span class="default"> = </span><span class="functionid">CV_AdaptiveThreshold</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">max_value</span><span class="default">,</span><span class="default">adaptive_method</span><span class="default">,</span><span class="default">thresh_type</span><span class="default">,</span><span class="default">blk_size</span><span class="default">,</span><span class="default">c</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">src :</span> - <dd><p class="para">Source 8-bit single-channel image.</p></dd></dt> - <dt><span class="term">max_value :</span> - <dd><p class="para">Non-zero value assigned to the pixels for which the condition is satisfied. See the details below.</p></dd></dt> - <dt><span class="term">adaptive_method :</span> - <dd><p class="para">Adaptive thresholding algorithm to use, ADAPTIVE_THRESH_MEAN_C or ADAPTIVE_THRESH_GAUSSIAN_C .</p></dd></dt> - <dt><span class="term">thresh_type :</span> - <dd><p class="para">Thresholding type that must be either THRESH_BINARY or THRESH_BINARY_INV .</p></dd></dt> - <dt><span class="term">blockSize :</span> - <dd><p class="para">Size of a pixel neighborhood that is used to calculate a threshold value for the pixel: 3, 5, 7, and so on.</p></dd></dt> - <dt><span class="term">C :</span> - <dd><p class="para">Constant subtracted from the mean or weighted mean.Normally, it is positive but may be zero or negative as well.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for adaptively threshold given image</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_AdaptiveThreshold(img</span><span class="scilabdefault">,</span><span class="scilabnumber">255</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">ADAPTIVE_THRESH_MEAN_C</span><span class="scilabstring">"</span><span class="scilabdefault">,</span> <span class="scilabspecial">...</span> -<span class="scilabstring">"</span><span class="scilabstring">THRESH_BINARY</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">5</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="AVRUARTTransmit.html"><< AVRUARTTransmit</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Blur.html">CV_Blur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_Blur.html b/2.3-1/help/en_US/scilab_en_US_help/CV_Blur.html deleted file mode 100644 index 78ced0cf..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_Blur.html +++ /dev/null @@ -1,96 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_Blur</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_AdaptiveThreshold.html"><< CV_AdaptiveThreshold</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Canny.html">CV_Canny >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_Blur</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_Blur</h1> - <p class="refpurpose">function to blur image using normalised box filter</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">dst</span><span class="default"> = </span><span class="functionid">CV_Blur</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">ksize_width</span><span class="default">,</span><span class="default">ksize_height</span><span class="default">,</span><span class="default">anchor_x</span><span class="default">,</span><span class="default">anchor_y</span><span class="default">,</span><span class="default">border_type</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg :</span> - <dd><p class="para">Source image.</p></dd></dt> - <dt><span class="term">ksize_width, ksize_height :</span> - <dd><p class="para">blurring kernel size.</p></dd></dt> - <dt><span class="term">anchor_x, anchor_y :</span> - <dd><p class="para">x,y coordinates of anchor point</p></dd></dt> - <dt><span class="term">border_type :</span> - <dd><p class="para">border mode used to extrapolate pixels outside of the image.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for blurring image using normalised box -filter. Image can be of any depth and have any no of channels.</p> - <p class="para">border_type can be : -<ul class="itemizedlist"><li>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</li> -<li>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</li> -<li>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</li> -<li>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</li> -<li>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_Blur(img</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilaboperator">-</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilaboperator">-</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">BORDER_CONSTANT</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_Threshold, CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_AdaptiveThreshold.html"><< CV_AdaptiveThreshold</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Canny.html">CV_Canny >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_Canny.html b/2.3-1/help/en_US/scilab_en_US_help/CV_Canny.html deleted file mode 100644 index 2efbc71a..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_Canny.html +++ /dev/null @@ -1,95 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_Canny</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_Blur.html"><< CV_Blur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CornerHarris.html">CV_CornerHarris >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_Canny</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_Canny</h1> - <p class="refpurpose">Finds edges in image using Canny algorithm</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">edges</span><span class="default"> = </span><span class="functionid">CV_Canny</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">threhold1</span><span class="default">,</span><span class="default">threshold2</span><span class="default">,</span><span class="default">aperture_size</span><span class="default">,</span><span class="default">L2gradient</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg :</span> - <dd><p class="para">single-channel 8-bit input image.</p></dd></dt> - <dt><span class="term">threshold1 :</span> - <dd><p class="para">first threshold for the hysteresis procedure.</p></dd></dt> - <dt><span class="term">threshold2 :</span> - <dd><p class="para">second threshold for the hysteresis procedure.</p></dd></dt> - <dt><span class="term">aperture_size :</span> - <dd><p class="para">aperture size for the Sobel() operator.</p></dd></dt> - <dt><span class="term">L2gradient :</span> - <dd><p class="para">a flag, indicating whether a more accurate</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for finding edes in single channel 8 bit -image. 'aperture_size' and 'L2gradient' are optionals. By default, -aperture_size is 3 and L2gradient is false.</p> - <p class="para">For L2gradient: L_2 norm =sqrt{(dI/dx)^2 + (dI/dy)^2} should be used to calculate the image gradient magnitude (L2gradient=1 ), or whether the default L_1 norm =|dI/dx|+|dI/dy| is enough (L2gradient=0).</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_CvtColor(img</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">CV_RGB2GRAY</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> -<span class="scilabid">edge</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_Canny</span><span class="scilabopenclose">(</span><a class="scilabcommand" href="scilab://dst">dst</a><span class="scilabdefault">,</span><span class="scilabnumber">50</span><span class="scilabdefault">,</span><span class="scilabnumber">100</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_Blur.html"><< CV_Blur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CornerHarris.html">CV_CornerHarris >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_CornerHarris.html b/2.3-1/help/en_US/scilab_en_US_help/CV_CornerHarris.html deleted file mode 100644 index 72cd4171..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_CornerHarris.html +++ /dev/null @@ -1,98 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_CornerHarris</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_Canny.html"><< CV_Canny</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CreateImage.html">CV_CreateImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_CornerHarris</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_CornerHarris</h1> - <p class="refpurpose">Finds edges in image using Harris algorithm</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">edges</span><span class="default"> = </span><span class="functionid">CV_CornerHarris</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">blocksize</span><span class="default">,</span><span class="default">ksize</span><span class="default">,</span><span class="default">k</span><span class="default">,</span><span class="default">border_type</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg:</span> - <dd><p class="para">Input single-channel 8-bit or floating-point image.</p></dd></dt> - <dt><span class="term">blockSize:</span> - <dd><p class="para">Neighborhood size</p></dd></dt> - <dt><span class="term">ksize:</span> - <dd><p class="para">Aperture parameter for the Sobel() operator.</p></dd></dt> - <dt><span class="term">k:</span> - <dd><p class="para">Harris detector free parameter.</p></dd></dt> - <dt><span class="term">border_type:</span> - <dd><p class="para">border mode used to extrapolate pixels outside of the image.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">The function runs the Harris edge detector on the image. For each pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y) over a blockSize * blockSize neighborhood. Then, it computes the following characteristic: dst(x,y) = det(M(x,y)) - k .tr(M(x,y))^2. Corners in the image can be found as the local maxima of this response map.</p> - <p class="para">border_type can be : -<ul class="itemizedlist"><li>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</li> -<li>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</li> -<li>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</li> -<li>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</li> -<li>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_CvtColor(img</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">CV_RGB2GRAY</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span> -<span class="scilabid">edge</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_CornerHarris</span><span class="scilabopenclose">(</span><a class="scilabcommand" href="scilab://dst">dst</a><span class="scilabdefault">,</span><span class="scilabnumber">5</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">BORDER_REPLICATE</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_Canny.html"><< CV_Canny</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CreateImage.html">CV_CreateImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_CreateImage.html b/2.3-1/help/en_US/scilab_en_US_help/CV_CreateImage.html deleted file mode 100644 index 0c28a03d..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_CreateImage.html +++ /dev/null @@ -1,85 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_CreateImage</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_CornerHarris.html"><< CV_CornerHarris</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CvtColor.html">CV_CvtColor >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_CreateImage</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_CreateImage</h1> - <p class="refpurpose">function to create an image object of given size and type</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_CreateImage</span><span class="default">(</span><span class="default">image_size</span><span class="default">,</span><span class="default">bit_depth</span><span class="default">,</span><span class="default">no_of_channels</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">image_size:</span> - <dd><p class="para">width and height of image</p></dd></dt> - <dt><span class="term">bit_depth:</span> - <dd><p class="para">Bit depth of image elements</p></dd></dt> - <dt><span class="term">no_of_channels:</span> - <dd><p class="para">no of channels per pixels</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used to create opencv image object. For more info about bit depth and channels,please refer to OpenCV documentation</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">CV_CreateImage</span><span class="scilabopenclose">(</span><span class="scilabopenclose">[</span><span class="scilabnumber">320</span> <span class="scilabnumber">240</span><span class="scilabopenclose">]</span><span class="scilabdefault">,</span> <span class="scilabstring">"</span><span class="scilabstring">IPL_DEPTH_8U</span><span class="scilabstring">"</span><span class="scilabdefault">,</span> <span class="scilabnumber">1</span><span class="scilabopenclose">)</span> <span class="scilabcomment">//to create image of the size 320*240 pixels with 8 bit unsigned each pixels and gray scale image</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_LoadImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_CornerHarris.html"><< CV_CornerHarris</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_CvtColor.html">CV_CvtColor >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_CvtColor.html b/2.3-1/help/en_US/scilab_en_US_help/CV_CvtColor.html deleted file mode 100644 index ce03acf5..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_CvtColor.html +++ /dev/null @@ -1,90 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_CvtColor</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_CreateImage.html"><< CV_CreateImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Dilate.html">CV_Dilate >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_CvtColor</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_CvtColor</h1> - <p class="refpurpose">function to convert image from one colorspace to other colorspace</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_CvtColor</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">code</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg:</span> - <dd><p class="para">source image to be converted</p></dd></dt> - <dt><span class="term">dstimg:</span> - <dd><p class="para">destination image in which to store converted image</p></dd></dt> - <dt><span class="term">code:</span> - <dd><p class="para">String specifying conversion type. Same as defined in OpenCV. for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image</p></dd></dt> - <dt><span class="term">dstCn:</span> - <dd><p class="para">no of channels in destination image (0 by default)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for converting an image to other colorspace. -Refer OpenCV documentation for list of available conversions</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_CvtColor(img</span><span class="scilabdefault">,</span><span class="scilabstring">'</span><span class="scilabstring">CV_RGB2GRAY</span><span class="scilabstring">'</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_CreateImage.html"><< CV_CreateImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Dilate.html">CV_Dilate >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_Dilate.html b/2.3-1/help/en_US/scilab_en_US_help/CV_Dilate.html deleted file mode 100644 index a4956766..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_Dilate.html +++ /dev/null @@ -1,99 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_Dilate</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_CvtColor.html"><< CV_CvtColor</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_DistanceTransform.html">CV_DistanceTransform >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_Dilate</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_Dilate</h1> - <p class="refpurpose">dilates an image by using a specific structuring element.</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">cvtimg</span><span class="default"> = </span><span class="functionid">CV_Dilate</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">dilation_type</span><span class="default">,</span><span class="default">dilation_size</span><span class="default">,[</span><span class="default">iterations</span><span class="default">,</span><span class="default">border_type</span><span class="default">,</span><span class="default">border_value</span><span class="default">])</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">src :</span> - <dd><p class="para">input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.</p></dd></dt> - <dt><span class="term">dilation_type :</span> - <dd><p class="para">can be one of MORPH_RECT, MORPH_CROSS,MORPH_ELLIPSE</p></dd></dt> - <dt><span class="term">dilation_size :</span> - <dd><p class="para">size of kernel to be used for erosion. Must be odd</p></dd></dt> - <dt><span class="term">iterations :</span> - <dd><p class="para">number of times erosion is applied.</p></dd></dt> - <dt><span class="term">border_type :</span> - <dd><p class="para">pixel extrapolation method.</p></dd></dt> - <dt><span class="term">border_value :</span> - <dd><p class="para">border value in case of a constant border</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets.</p> - <p class="para">border_type can be : -<ul class="itemizedlist"><li><p class="para">BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</p></li> -<li><p class="para">BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</p></li> -<li><p class="para">BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</p></li> -<li><p class="para">BORDER_WRAP: cdefgh|abcdefgh|abcdefg</p></li> -<li><p class="para">BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_Erode(img</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">MORPH_RECT</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">BORDER_CONSTANT</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_Erode</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_CvtColor.html"><< CV_CvtColor</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_DistanceTransform.html">CV_DistanceTransform >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_DistanceTransform.html b/2.3-1/help/en_US/scilab_en_US_help/CV_DistanceTransform.html deleted file mode 100644 index fd2d7d70..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_DistanceTransform.html +++ /dev/null @@ -1,87 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_DistanceTransform</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_Dilate.html"><< CV_Dilate</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Erode.html">CV_Erode >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_DistanceTransform</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_DistanceTransform</h1> - <p class="refpurpose">function to calculate distance to closest zero pixels for each pixel</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">dst</span><span class="default"> = </span><span class="functionid">CV_DistanceTransform</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">distance_type</span><span class="default">,</span><span class="default">mask_size</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg :</span> - <dd><p class="para">Source 8-bit single-channel image.</p></dd></dt> - <dt><span class="term">distance_type :</span> - <dd><p class="para">Type of distance. It can be CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C</p></dd></dt> - <dt><span class="term">mask_size :</span> - <dd><p class="para">Size of the distance transform mask</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used to calculate distance to closest zero pixel for each pixel of the source image. Output is 32 bit floatingpoint, single channel image of the same size as that of source image.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_DistanceTransform(img</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">CV_DIST_L1</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_Dilate.html"><< CV_Dilate</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Erode.html">CV_Erode >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_Erode.html b/2.3-1/help/en_US/scilab_en_US_help/CV_Erode.html deleted file mode 100644 index fe863700..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_Erode.html +++ /dev/null @@ -1,99 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_Erode</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_DistanceTransform.html"><< CV_DistanceTransform</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_GaussianBlur.html">CV_GaussianBlur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_Erode</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_Erode</h1> - <p class="refpurpose">Erodes an image by using a specific structuring element.</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">cvtimg</span><span class="default"> = </span><span class="functionid">CV_Erode</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">erosion_type</span><span class="default">,</span><span class="default">erosion_size</span><span class="default">,[</span><span class="default">iterations</span><span class="default">,</span><span class="default">border_type</span><span class="default">,</span><span class="default">border_value</span><span class="default">])</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">src :</span> - <dd><p class="para">input image; the number of channels can be arbitrary, but the depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.</p></dd></dt> - <dt><span class="term">erosion_type :</span> - <dd><p class="para">can be one of : MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE</p></dd></dt> - <dt><span class="term">erosion_size :</span> - <dd><p class="para">size of kernel to be used for erosion. Must be odd</p></dd></dt> - <dt><span class="term">iterations :</span> - <dd><p class="para">number of times erosion is applied.</p></dd></dt> - <dt><span class="term">border_type :</span> - <dd><p class="para">pixel extrapolation method.</p></dd></dt> - <dt><span class="term">border_value :</span> - <dd><p class="para">border value in case of a constant border</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for eroding an image. Kernel used for erosion is decided by type and size. Size must always be odd. Anchor pint of kernel is always center of kernel. Input arguements 'iterations(1), border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not specified, default values as as mentioned in brackets.</p> - <p class="para">border_type can be : -<ul class="itemizedlist"><li>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</li> -<li>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</li> -<li>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</li> -<li>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</li> -<li>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_Erode(img</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">MORPH_RECT</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">1</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">BORDER_CONSTANT</span><span class="scilabstring">"</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_Dilate</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_DistanceTransform.html"><< CV_DistanceTransform</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_GaussianBlur.html">CV_GaussianBlur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_GaussianBlur.html b/2.3-1/help/en_US/scilab_en_US_help/CV_GaussianBlur.html deleted file mode 100644 index e6ed4e62..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_GaussianBlur.html +++ /dev/null @@ -1,98 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_GaussianBlur</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_Erode.html"><< CV_Erode</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_GetImgSize.html">CV_GetImgSize >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_GaussianBlur</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_GaussianBlur</h1> - <p class="refpurpose">function to blur image using gaussian filter</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">cvtimg</span><span class="default"> = </span><span class="functionid">CV_GaussianBlur</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">ksize_width</span><span class="default">,</span><span class="default">ksize_height</span><span class="default">,</span><span class="default">sigma_x</span><span class="default">,</span><span class="default">sigma_y</span><span class="default">,</span><span class="default">border_type</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg :</span> - <dd><p class="para">Source image.</p></dd></dt> - <dt><span class="term">ksize_width, ksize_height :</span> - <dd><p class="para">blurring kernel size. must be odd.</p></dd></dt> - <dt><span class="term">sigmaX :</span> - <dd><p class="para">Gaussian kernel standard deviation in X direction.</p></dd></dt> - <dt><span class="term">sigmaY :</span> - <dd><p class="para">Gaussian kernel standard deviation in Y direction;</p></dd></dt> - <dt><span class="term">border_type :</span> - <dd><p class="para">border mode used to extrapolate pixels outside of the image.</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for blurring image using gaussian filter. Image can be of any depth and have any no of channels.</p> - <p class="para">For sigmaX and sigmaY : if sigmaY is zero, it is set to be equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height , respectively.</p> - <p class="para">border_type can be : -<ul class="itemizedlist"><li>BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh</li> -<li>BORDER_REFLECT: fedcba|abcdefgh|hgfedcb</li> -<li>BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba</li> -<li>BORDER_WRAP: cdefgh|abcdefgh|abcdefg</li> -<li>BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii</li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_GaussianBlur(img</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabdefault">,</span><span class="scilabstring">"</span><span class="scilabstring">BORDER_CONSTANT</span><span class="scilabstring">"</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_Blur, CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_Erode.html"><< CV_Erode</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_GetImgSize.html">CV_GetImgSize >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_GetImgSize.html b/2.3-1/help/en_US/scilab_en_US_help/CV_GetImgSize.html deleted file mode 100644 index 21ec770f..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_GetImgSize.html +++ /dev/null @@ -1,84 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_GetImgSize</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_GaussianBlur.html"><< CV_GaussianBlur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_LoadImage.html">CV_LoadImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_GetImgSize</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_GetImgSize</h1> - <p class="refpurpose">function to get size of the image (width*height)</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_GetImgSize</span><span class="default">(</span><span class="default">img</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">img:</span> - <dd><p class="para">image whose size is to be returned</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for retriving size information of the image. -It returs an array with first image element as width and second as height</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://size">size</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_GetImgSize(img)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_GaussianBlur.html"><< CV_GaussianBlur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_LoadImage.html">CV_LoadImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_LoadImage.html b/2.3-1/help/en_US/scilab_en_US_help/CV_LoadImage.html deleted file mode 100644 index f18261a2..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_LoadImage.html +++ /dev/null @@ -1,88 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_LoadImage</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_GetImgSize.html"><< CV_GetImgSize</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_MedianBlur.html">CV_MedianBlur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_LoadImage</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_LoadImage</h1> - <p class="refpurpose">function to load an image object from given filename</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_LoadImage</span><span class="default">(</span><span class="default">filename</span><span class="default">,</span><span class="default">loadtype</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">filename:</span> - <dd><p class="para">name of file to be opened</p></dd></dt> - <dt><span class="term">loadtype:</span> - <dd><p class="para">desired load method</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for loading a previously stored image</p> - <p class="para">loadtype can take the following values: -<ul class="itemizedlist"><li><p class="para">less than 0 -> image is loaded as is (with alpha channel)</p></li> -<li><p class="para">0 -> image is loaded as greyscale</p></li> -<li><p class="para">greater than 0 -> 3 channel color image is loaded</p></li></ul></p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_CreateImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_GetImgSize.html"><< CV_GetImgSize</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_MedianBlur.html">CV_MedianBlur >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_MedianBlur.html b/2.3-1/help/en_US/scilab_en_US_help/CV_MedianBlur.html deleted file mode 100644 index 7821e2a4..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_MedianBlur.html +++ /dev/null @@ -1,86 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_MedianBlur</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_LoadImage.html"><< CV_LoadImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_SaveImage.html">CV_SaveImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_MedianBlur</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_MedianBlur</h1> - <p class="refpurpose">function to blur image using median filter</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">cvtimg</span><span class="default"> = </span><span class="functionid">CV_MedianBlur</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">ksize</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg :</span> - <dd><p class="para">input 1-, 3-, or 4-channel image; when ksize is 3 or 5, the image depth should be CV_8U, CV_16U, or CV_32F, for larger aperture sizes, it can only be CV_8U.</p></dd></dt> - <dt><span class="term">ksize_width :</span> - <dd><p class="para">aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for blurring image using median -filter. Image can be of any depth and have any no of channels.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_MedianBlur(img</span><span class="scilabdefault">,</span><span class="scilabnumber">3</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="scilab://CV_GaussianBlur," class="link">CV_Blur, CV_CvtColor</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_LoadImage.html"><< CV_LoadImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_SaveImage.html">CV_SaveImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_SaveImage.html b/2.3-1/help/en_US/scilab_en_US_help/CV_SaveImage.html deleted file mode 100644 index 94da92e4..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_SaveImage.html +++ /dev/null @@ -1,86 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_SaveImage</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_MedianBlur.html"><< CV_MedianBlur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_ShowImage.html">CV_ShowImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_SaveImage</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_SaveImage</h1> - <p class="refpurpose">function to save an image object as a given filename</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_SaveImage</span><span class="default">(</span><span class="default">filename</span><span class="default">,</span><span class="default">img</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">filename:</span> - <dd><p class="para">name of file image to be saved as</p></dd></dt> - <dt><span class="term">img:</span> - <dd><p class="para">image to be saved</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for saving image. File format is detected -from file extension</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<span class="scilabid">CV_SaveImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">test1.png</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabid">img</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_MedianBlur.html"><< CV_MedianBlur</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_ShowImage.html">CV_ShowImage >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_ShowImage.html b/2.3-1/help/en_US/scilab_en_US_help/CV_ShowImage.html deleted file mode 100644 index fe6c088c..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_ShowImage.html +++ /dev/null @@ -1,86 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_ShowImage</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_SaveImage.html"><< CV_SaveImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Threshold.html">CV_Threshold >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_ShowImage</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_ShowImage</h1> - <p class="refpurpose">function to show an image</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_ShowImage</span><span class="default">(</span><span class="default">img</span><span class="default">)</span> -<span class="functionid">CV_ShowImage</span><span class="default">(</span><span class="default">winname</span><span class="default">,</span><span class="default">img</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">winname:</span> - <dd><p class="para">name of window in which img is to be shown</p></dd></dt> - <dt><span class="term">img:</span> - <dd><p class="para">image to be shown already acquired (from file/camera)</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for showing images</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<span class="scilabid">CV_ShowImage</span><span class="scilabopenclose">(</span><span class="scilabid">img</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_CreateImage.html" class="link">CV_LoadImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_SaveImage.html"><< CV_SaveImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_Threshold.html">CV_Threshold >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_Threshold.html b/2.3-1/help/en_US/scilab_en_US_help/CV_Threshold.html deleted file mode 100644 index 90f6f96f..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_Threshold.html +++ /dev/null @@ -1,90 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_Threshold</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_ShowImage.html"><< CV_ShowImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_WaitKey.html">CV_WaitKey >></a></span> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_Threshold</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_Threshold</h1> - <p class="refpurpose">function to threshold input image</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="default">dst</span><span class="default"> = </span><span class="functionid">CV_Threshold</span><span class="default">(</span><span class="default">srcimg</span><span class="default">,</span><span class="default">code</span><span class="default">,</span><span class="default">threshold</span><span class="default">,</span><span class="default">max_value</span><span class="default">,</span><span class="default">thresh_type</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">srcimg:</span> - <dd><p class="para">source image to be converted</p></dd></dt> - <dt><span class="term">threshold:</span> - <dd><p class="para">threshold value</p></dd></dt> - <dt><span class="term">max_value:</span> - <dd><p class="para">maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV</p></dd></dt> - <dt><span class="term">thresh_type:</span> - <dd><p class="para">Type for threshold. It can one of the following: THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for converting an image to other colorspace. -Refer OpenCV documentation for list of available conversions</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<a class="scilabcommand" href="scilab://dst">dst</a> <span class="scilabstring">=</span> <span class="scilabstring">CV_Threshold(img</span><span class="scilabdefault">,</span><span class="scilabnumber">100</span><span class="scilabdefault">,</span><span class="scilabnumber">255</span><span class="scilabdefault">,</span><span class="scilabstring">'</span><span class="scilabstring">THRESH_BINARY</span><span class="scilabstring">'</span><span class="scilabopenclose">)</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_CreateImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_ShowImage.html"><< CV_ShowImage</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - <span class="next"><a href="CV_WaitKey.html">CV_WaitKey >></a></span> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/CV_WaitKey.html b/2.3-1/help/en_US/scilab_en_US_help/CV_WaitKey.html deleted file mode 100644 index d81650a9..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/CV_WaitKey.html +++ /dev/null @@ -1,83 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>CV_WaitKey</title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - <span class="previous"><a href="CV_Threshold.html"><< CV_Threshold</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> <a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a> > CV_WaitKey</span> - - <br /><br /> - <div class="refnamediv"><h1 class="refname">CV_WaitKey</h1> - <p class="refpurpose">function similar to cvWaitKey</p></div> - - -<div class="refsynopsisdiv"><h3 class="title">Calling Sequence</h3> - <div class="synopsis"><pre><span class="functionid">CV_WaitKey</span><span class="default">(</span><span class="default">delay</span><span class="default">)</span></pre></div></div> - -<div class="refsection"><h3 class="title">Parameters</h3> - <dl><dt><span class="term">delay:</span> - <dd><p class="para">waiting delay, if 0 then wait till keypress</p></dd></dt></dl></div> - -<div class="refsection"><h3 class="title">Description</h3> - <p class="para">This function can be used for inseting some delay. This function must -follow CV_ShowImage to display image.</p> - <p class="para">This is curretly dummy function. It provides no functionality but is required -for providing support for generating C code for OpenCV</p> - <p class="para"></p></div> - -<div class="refsection"><h3 class="title">Examples</h3> - <div class="programlisting"><table border="0" width="100%"><tr><td width="98%"><pre class="scilabcode"><span class="scilabid">img</span> <span class="scilaboperator">=</span> <span class="scilabid">CV_LoadImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">~/test.jpg</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span> -<span class="scilabid">CV_ShowImage</span><span class="scilabopenclose">(</span><span class="scilabstring">'</span><span class="scilabstring">'</span><span class="scilabdefault">,</span><span class="scilabid">img</span><span class="scilabopenclose">)</span> -<span class="scilabid">CV_WaitKey</span><span class="scilabopenclose">(</span><span class="scilabnumber">0</span><span class="scilabopenclose">)</span><span class="scilabdefault">;</span></pre></td><td valign="top"><a href="scilab://scilab.execexample/"><img src="ScilabExecute.png" border="0"/></a></td><td valign="top"><a href="scilab://scilab.editexample/"><img src="ScilabEdit.png" border="0"/></a></td><td></td></tr></table></div></div> - -<div class="refsection"><h3 class="title">See also</h3> - <ul class="itemizedlist"><li class="member"><a href="CV_LoadImage.html" class="link">CV_ShowImage</a></li></ul></div> - -<div class="refsection"><h3 class="title">Authors</h3> - <ul class="itemizedlist"><li class="member">Siddhesh Wani</li></ul></div> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - <span class="previous"><a href="CV_Threshold.html"><< CV_Threshold</a></span> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="section_4d177ceb9ae128b1850140a7901a140a.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS Binary files differdeleted file mode 100644 index 7aa98ed1..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB deleted file mode 100644 index ec5d02fd..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB +++ /dev/null @@ -1 +0,0 @@ -eÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿuÿÿÿÿÿuÿÿÿÿÿý×ÿÿ4Ÿ÷_ÿÿÿÿÿÿÿý×ÿÿÿÿÿüÂÿÿÿÿÿÿÿý×ÿÿÿÿÿÿ÷_ÿÝÿÿuÿÿÿÿÝÿÿÿÿÿÿÝÿý×ÿÿý×ÿý×ÿuÿÝý×Ý}×ÿ÷_ÿÿÿuÿÿÿÿýóŸÿýÔÒý×Ý@ ¨XrÇ ªñuVév¸`T`Z2 Z†…©Zµe ~Q‘iq‘Qj]åÙXh^]ªV”`TpXdÂ!Q¥iZ•—l`^WV¡¡V•”l]^\r¡Q(Î ˜r pQ– ®‡!Jªd¯u¿ÿÿÿ ªªŠ0–0qÊ¡FQ‘J™\`WËó ÄrÍ*/ú£K8««£ £¢®ª¨Ï+¬ÂúŒ*ºªº0³ £ª0£*‹ªª¨Øªªªªª¨âªª9,£*ªª®ªŠººª2ªª˜ª«ªªª»ªªªÿ0ªª¯óKÿÿ2/ÿÿÿÿÿÿÿÿÿÿüÂÿÿüÂÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ`
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS Binary files differdeleted file mode 100644 index db02be4d..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS Binary files differdeleted file mode 100644 index 89dfc42b..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA deleted file mode 100644 index 03cfc0b7..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ /dev/null @@ -1,2 +0,0 @@ -JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=730 id2=1 diff --git a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP Binary files differdeleted file mode 100644 index f19ac947..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabCaution.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabCaution.png Binary files differdeleted file mode 100644 index 231159a5..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabCaution.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabEdit.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabEdit.png Binary files differdeleted file mode 100644 index ff0cca72..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabEdit.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabExecute.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabExecute.png Binary files differdeleted file mode 100644 index 4acd4b93..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabExecute.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabImportant.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabImportant.png Binary files differdeleted file mode 100644 index 73931b2c..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabImportant.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabNote.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabNote.png Binary files differdeleted file mode 100644 index 6607ece6..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabNote.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabTip.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabTip.png Binary files differdeleted file mode 100644 index 6607ece6..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabTip.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/ScilabWarning.png b/2.3-1/help/en_US/scilab_en_US_help/ScilabWarning.png Binary files differdeleted file mode 100644 index 231159a5..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/ScilabWarning.png +++ /dev/null diff --git a/2.3-1/help/en_US/scilab_en_US_help/c_code.css b/2.3-1/help/en_US/scilab_en_US_help/c_code.css deleted file mode 100644 index 948d2eea..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/c_code.css +++ /dev/null @@ -1,54 +0,0 @@ -.ccomment { - font-style: italic; - color: #b22222 -} - -.cdefault { - font-style: normal; - color: #000000 -} - -.copenclose { - font-style: normal; - color: #000000 -} - -.coperator { - font-style: normal; - color: #000000 -} - -.cstring { - font-style: normal; - color: #a6557a -} - -.ctype { - font-style: normal; - color: #55a655 -} - -.cpreprocessor { - font-style: normal; - color: #9965a6 -} - -.cid { - font-style: normal; - color: #000000 -} - -.ckeyword { - font-style: normal; - color: #ad3ff2 -} - -.cmodifier { - font-style: normal; - color: #ad3ff2 -} - -.cnumber { - font-style: normal; - color: #008b8b -} diff --git a/2.3-1/help/en_US/scilab_en_US_help/index.html b/2.3-1/help/en_US/scilab_en_US_help/index.html deleted file mode 100644 index 83e3712e..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/index.html +++ /dev/null @@ -1,259 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title></title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - - - - - <br /><br /> - <h3 class="book-title">Scilab 2 C Converter</h3> -<ul class="list-part"><a name="scilab_2_c_converter_manual"></a><div class="info"></div> - -<li><a href="section_4d177ceb9ae128b1850140a7901a140a.html" class="part">Scilab 2 C Converter</a> -<ul class="list-chapter"><li><a href="AVRADCSetup.html" class="refentry">AVRADCSetup</a> — <span class="refentry-description">Function to initialise ADC of AVR</span></li> - - - - - -<li><a href="AVRDigitalIn.html" class="refentry">AVRDigitalIn</a> — <span class="refentry-description">Function to get state (high\low) of a digital input pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalOut.html" class="refentry">AVRDigitalOut</a> — <span class="refentry-description">Function to change state (high\low) of a digital output pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalPortSetup.html" class="refentry">AVRDigitalPortSetup</a> — <span class="refentry-description">Function to decide direction of port on AVR</span></li> - - - - - -<li><a href="AVRDigitalSetup.html" class="refentry">AVRDigitalSetup</a> — <span class="refentry-description">Function to decide direction of a digital pin on AVR</span></li> - - - - - -<li><a href="AVRGetTimerValue.html" class="refentry">AVRGetTimerValue</a> — <span class="refentry-description">Function to get timer count</span></li> - - - - - -<li><a href="AVRPWM0SetDuty.html" class="refentry">AVRPWM0SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</span></li> - - - - - -<li><a href="AVRPWM0Setup.html" class="refentry">AVRPWM0Setup</a> — <span class="refentry-description">Function to Setup OC0 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM1SetDuty.html" class="refentry">AVRPWM1SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</span></li> - - - - - -<li><a href="AVRPWM1Setup.html" class="refentry">AVRPWM1Setup</a> — <span class="refentry-description">Function to Setup OC1A or OC1B pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM2SetDuty.html" class="refentry">AVRPWM2SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</span></li> - - - - - -<li><a href="AVRPWM2Setup.html" class="refentry">AVRPWM2Setup</a> — <span class="refentry-description">Function to Setup OC2 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRReadADC.html" class="refentry">AVRReadADC</a> — <span class="refentry-description">Function to get voltage on analog pin on AVR</span></li> - - - - - -<li><a href="AVRSleep.html" class="refentry">AVRSleep</a> — <span class="refentry-description">Function to pause the execution for the given time.</span></li> - - - - - -<li><a href="AVRTimerSetup.html" class="refentry">AVRTimerSetup</a> — <span class="refentry-description">Function to setup Timers in ATmega16</span></li> - - - - - -<li><a href="AVRUARTReceive.html" class="refentry">AVRUARTReceive</a> — <span class="refentry-description">Function to Receive Char value send to ATmega16 using UART or USART.</span></li> - - - - - -<li><a href="AVRUARTSetup.html" class="refentry">AVRUARTSetup</a> — <span class="refentry-description">Function to Setup Serial Communication i.e UART or USART in ATmega16.</span></li> - - - - - -<li><a href="AVRUARTTransmit.html" class="refentry">AVRUARTTransmit</a> — <span class="refentry-description">Function to Transmit data using UART or USART.</span></li> - - - - - -<li><a href="CV_AdaptiveThreshold.html" class="refentry">CV_AdaptiveThreshold</a> — <span class="refentry-description">function to adaptively threshold input image</span></li> - - - - - -<li><a href="CV_Blur.html" class="refentry">CV_Blur</a> — <span class="refentry-description">function to blur image using normalised box filter</span></li> - - - - - -<li><a href="CV_Canny.html" class="refentry">CV_Canny</a> — <span class="refentry-description">Finds edges in image using Canny algorithm</span></li> - - - - - -<li><a href="CV_CornerHarris.html" class="refentry">CV_CornerHarris</a> — <span class="refentry-description">Finds edges in image using Harris algorithm</span></li> - - - - - -<li><a href="CV_CreateImage.html" class="refentry">CV_CreateImage</a> — <span class="refentry-description">function to create an image object of given size and type</span></li> - - - - - -<li><a href="CV_CvtColor.html" class="refentry">CV_CvtColor</a> — <span class="refentry-description">function to convert image from one colorspace to other colorspace</span></li> - - - - - -<li><a href="CV_Dilate.html" class="refentry">CV_Dilate</a> — <span class="refentry-description">dilates an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_DistanceTransform.html" class="refentry">CV_DistanceTransform</a> — <span class="refentry-description">function to calculate distance to closest zero pixels for each pixel</span></li> - - - - - -<li><a href="CV_Erode.html" class="refentry">CV_Erode</a> — <span class="refentry-description">Erodes an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_GaussianBlur.html" class="refentry">CV_GaussianBlur</a> — <span class="refentry-description">function to blur image using gaussian filter</span></li> - - - - - -<li><a href="CV_GetImgSize.html" class="refentry">CV_GetImgSize</a> — <span class="refentry-description">function to get size of the image (width*height)</span></li> - - - - - -<li><a href="CV_LoadImage.html" class="refentry">CV_LoadImage</a> — <span class="refentry-description">function to load an image object from given filename</span></li> - - - - - -<li><a href="CV_MedianBlur.html" class="refentry">CV_MedianBlur</a> — <span class="refentry-description">function to blur image using median filter</span></li> - - - - - -<li><a href="CV_SaveImage.html" class="refentry">CV_SaveImage</a> — <span class="refentry-description">function to save an image object as a given filename</span></li> - - - - - -<li><a href="CV_ShowImage.html" class="refentry">CV_ShowImage</a> — <span class="refentry-description">function to show an image</span></li> - - - - - -<li><a href="CV_Threshold.html" class="refentry">CV_Threshold</a> — <span class="refentry-description">function to threshold input image</span></li> - - - - - -<li><a href="CV_WaitKey.html" class="refentry">CV_WaitKey</a> — <span class="refentry-description">function similar to cvWaitKey</span></li></ul></li></ul> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml b/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml deleted file mode 100644 index aa5a66e2..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" "http://java.sun.com/products/javahelp/index_1_0.dtd"> -<index version="1.0"/>
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelpmap.jhm b/2.3-1/help/en_US/scilab_en_US_help/jhelpmap.jhm deleted file mode 100644 index a2225c6e..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd"> -<map version="1.0"> -<mapID target="index" url="index.html"/> -<mapID target="section_4d177ceb9ae128b1850140a7901a140a" url="section_4d177ceb9ae128b1850140a7901a140a.html"/> -<mapID target="AVRADCSetup" url="AVRADCSetup.html"/> -<mapID target="AVRDigitalIn" url="AVRDigitalIn.html"/> -<mapID target="AVRDigitalOut" url="AVRDigitalOut.html"/> -<mapID target="AVRDigitalPortSetup" url="AVRDigitalPortSetup.html"/> -<mapID target="AVRDigitalSetup" url="AVRDigitalSetup.html"/> -<mapID target="AVRGetTimerValue" url="AVRGetTimerValue.html"/> -<mapID target="AVRPWM0SetDuty" url="AVRPWM0SetDuty.html"/> -<mapID target="AVRPWM0Setup" url="AVRPWM0Setup.html"/> -<mapID target="AVRPWM1SetDuty" url="AVRPWM1SetDuty.html"/> -<mapID target="AVRPWM1Setup" url="AVRPWM1Setup.html"/> -<mapID target="AVRPWM2SetDuty" url="AVRPWM2SetDuty.html"/> -<mapID target="AVRPWM2Setup" url="AVRPWM2Setup.html"/> -<mapID target="AVRReadADC" url="AVRReadADC.html"/> -<mapID target="AVRSleep" url="AVRSleep.html"/> -<mapID target="AVRTimerSetup" url="AVRTimerSetup.html"/> -<mapID target="AVRUARTReceive" url="AVRUARTReceive.html"/> -<mapID target="AVRUARTSetup" url="AVRUARTSetup.html"/> -<mapID target="AVRUARTTransmit" url="AVRUARTTransmit.html"/> -<mapID target="CV_AdaptiveThreshold" url="CV_AdaptiveThreshold.html"/> -<mapID target="CV_Blur" url="CV_Blur.html"/> -<mapID target="CV_Canny" url="CV_Canny.html"/> -<mapID target="CV_CornerHarris" url="CV_CornerHarris.html"/> -<mapID target="CV_CreateImage" url="CV_CreateImage.html"/> -<mapID target="CV_CvtColor" url="CV_CvtColor.html"/> -<mapID target="CV_Dilate" url="CV_Dilate.html"/> -<mapID target="CV_DistanceTransform" url="CV_DistanceTransform.html"/> -<mapID target="CV_Erode" url="CV_Erode.html"/> -<mapID target="CV_GaussianBlur" url="CV_GaussianBlur.html"/> -<mapID target="CV_GetImgSize" url="CV_GetImgSize.html"/> -<mapID target="CV_LoadImage" url="CV_LoadImage.html"/> -<mapID target="CV_MedianBlur" url="CV_MedianBlur.html"/> -<mapID target="CV_SaveImage" url="CV_SaveImage.html"/> -<mapID target="CV_ShowImage" url="CV_ShowImage.html"/> -<mapID target="CV_Threshold" url="CV_Threshold.html"/> -<mapID target="CV_WaitKey" url="CV_WaitKey.html"/> -</map>
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelpset.hs b/2.3-1/help/en_US/scilab_en_US_help/jhelpset.hs deleted file mode 100644 index 04f9fef5..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/jhelpset.hs +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE helpset - PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" "http://java.sun.com/products/javahelp/helpset_1_0.dtd"> -<helpset version="1.0"> -<title>Scilab 2 C Converter</title> -<maps> -<homeID>top</homeID> -<mapref location="jhelpmap.jhm"/> -</maps> -<view> -<name>TOC</name> -<label>Table Of Contents</label> -<type>javax.help.TOCView</type> -<data>jhelptoc.xml</data> -</view> -<view> -<name>Index</name> -<label>Index</label> -<type>javax.help.IndexView</type> -<data>jhelpidx.xml</data> -</view> -<view> -<name>Search</name> -<label>Search</label> -<type>javax.help.SearchView</type> -<data engine="com.sun.java.help.search.DefaultSearchEngine">JavaHelpSearch</data> -</view> -</helpset>
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml b/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml deleted file mode 100644 index 7c20d44f..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd"> -<toc version="1.0"> -<tocitem target="index" text="Scilab 2 C Converter"> -<tocitem target="section_4d177ceb9ae128b1850140a7901a140a" text="Scilab 2 C Converter"> -<tocitem target="AVRADCSetup" text="AVRADCSetup"/> -<tocitem target="AVRDigitalIn" text="AVRDigitalIn"/> -<tocitem target="AVRDigitalOut" text="AVRDigitalOut"/> -<tocitem target="AVRDigitalPortSetup" text="AVRDigitalPortSetup"/> -<tocitem target="AVRDigitalSetup" text="AVRDigitalSetup"/> -<tocitem target="AVRGetTimerValue" text="AVRGetTimerValue"/> -<tocitem target="AVRPWM0SetDuty" text="AVRPWM0SetDuty"/> -<tocitem target="AVRPWM0Setup" text="AVRPWM0Setup"/> -<tocitem target="AVRPWM1SetDuty" text="AVRPWM1SetDuty"/> -<tocitem target="AVRPWM1Setup" text="AVRPWM1Setup"/> -<tocitem target="AVRPWM2SetDuty" text="AVRPWM2SetDuty"/> -<tocitem target="AVRPWM2Setup" text="AVRPWM2Setup"/> -<tocitem target="AVRReadADC" text="AVRReadADC"/> -<tocitem target="AVRSleep" text="AVRSleep"/> -<tocitem target="AVRTimerSetup" text="AVRTimerSetup"/> -<tocitem target="AVRUARTReceive" text="AVRUARTReceive"/> -<tocitem target="AVRUARTSetup" text="AVRUARTSetup"/> -<tocitem target="AVRUARTTransmit" text="AVRUARTTransmit"/> -<tocitem target="CV_AdaptiveThreshold" text="CV_AdaptiveThreshold"/> -<tocitem target="CV_Blur" text="CV_Blur"/> -<tocitem target="CV_Canny" text="CV_Canny"/> -<tocitem target="CV_CornerHarris" text="CV_CornerHarris"/> -<tocitem target="CV_CreateImage" text="CV_CreateImage"/> -<tocitem target="CV_CvtColor" text="CV_CvtColor"/> -<tocitem target="CV_Dilate" text="CV_Dilate"/> -<tocitem target="CV_DistanceTransform" text="CV_DistanceTransform"/> -<tocitem target="CV_Erode" text="CV_Erode"/> -<tocitem target="CV_GaussianBlur" text="CV_GaussianBlur"/> -<tocitem target="CV_GetImgSize" text="CV_GetImgSize"/> -<tocitem target="CV_LoadImage" text="CV_LoadImage"/> -<tocitem target="CV_MedianBlur" text="CV_MedianBlur"/> -<tocitem target="CV_SaveImage" text="CV_SaveImage"/> -<tocitem target="CV_ShowImage" text="CV_ShowImage"/> -<tocitem target="CV_Threshold" text="CV_Threshold"/> -<tocitem target="CV_WaitKey" text="CV_WaitKey"/> -</tocitem> -</tocitem> -</toc>
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/scilab_code.css b/2.3-1/help/en_US/scilab_en_US_help/scilab_code.css deleted file mode 100644 index 658f42e0..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/scilab_code.css +++ /dev/null @@ -1,96 +0,0 @@ -.scilabcomment { - font-style: italic; - color: #01a801 -} - -.scilabdefault { - font-style: normal; - color: #000000 -} - -.scilabspecial { - font-style: normal; - color: #ffaa00 -} - -.scilabconstants { - font-style: normal; - color: #da70d6 -} - -.scilaboperator { - font-style: normal; - color: #5c5c5c -} - -.scilabnumber { - font-style: normal; - color: #bc8f8f -} - -.scilabfkeyword { - font-style: normal; - color: #b01813 -} - -.scilabskeyword { - font-style: normal; - color: #a020f0 -} - -.scilabckeyword { - font-style: normal; - color: #5f9ea0 -} - -.scilabcommand { - font-style: normal; - color: #32b9b9 -} - -.scilabmacro { - font-style: normal; - color: #ae5cb0 -} - -a.scilabcommand { - font-style: normal; - text-decoration: underline; - color: #32b9b9 -} - -a.scilabmacro { - font-style: normal; - text-decoration: underline; - color: #ae5cb0 -} - -.scilabstring { - font-style: normal; - color: #bc8f8f -} - -.scilabid { - font-style: normal; - color: #000000 -} - -.scilabinputoutputargs { - font-weight: bold; - color: #834310 -} - -.scilabfunctionid { - font-weight: bold; - color: #000000 -} - -.scilabfield { - font-style: normal; - color: #aaaaaa -} - -.scilabopenclose { - font-style: normal; - color: #4a55db -} diff --git a/2.3-1/help/en_US/scilab_en_US_help/section_0da8c7f3adca54f0475553087384b7a7.html b/2.3-1/help/en_US/scilab_en_US_help/section_0da8c7f3adca54f0475553087384b7a7.html deleted file mode 100644 index 647ce7ce..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/section_0da8c7f3adca54f0475553087384b7a7.html +++ /dev/null @@ -1,259 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title></title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> Scilab 2 C Converter</span> - - <br /><br /> - <h3 class="title-part">Scilab 2 C Converter</h3> -<ul class="list-chapter"><li><a href="AVRADCSetup.html" class="refentry">AVRADCSetup</a> — <span class="refentry-description">Function to initialise ADC of AVR</span></li> - - - - - -<li><a href="AVRDigitalIn.html" class="refentry">AVRDigitalIn</a> — <span class="refentry-description">Function to get state (high\low) of a digital input pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalOut.html" class="refentry">AVRDigitalOut</a> — <span class="refentry-description">Function to change state (high\low) of a digital output pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalPortSetup.html" class="refentry">AVRDigitalPortSetup</a> — <span class="refentry-description">Function to decide direction of port on AVR</span></li> - - - - - -<li><a href="AVRDigitalSetup.html" class="refentry">AVRDigitalSetup</a> — <span class="refentry-description">Function to decide direction of a digital pin on AVR</span></li> - - - - - -<li><a href="AVRGetTimerValue.html" class="refentry">AVRGetTimerValue</a> — <span class="refentry-description">Function to get timer count</span></li> - - - - - -<li><a href="AVRPWM0SetDuty.html" class="refentry">AVRPWM0SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</span></li> - - - - - -<li><a href="AVRPWM0Setup.html" class="refentry">AVRPWM0Setup</a> — <span class="refentry-description">Function to Setup OC0 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM1SetDuty.html" class="refentry">AVRPWM1SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</span></li> - - - - - -<li><a href="AVRPWM1Setup.html" class="refentry">AVRPWM1Setup</a> — <span class="refentry-description">Function to Setup OC1A or OC1B pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM2SetDuty.html" class="refentry">AVRPWM2SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</span></li> - - - - - -<li><a href="AVRPWM2Setup.html" class="refentry">AVRPWM2Setup</a> — <span class="refentry-description">Function to Setup OC2 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRReadADC.html" class="refentry">AVRReadADC</a> — <span class="refentry-description">Function to get voltage on analog pin on AVR</span></li> - - - - - -<li><a href="AVRSleep.html" class="refentry">AVRSleep</a> — <span class="refentry-description">Function to pause the execution for the given time.</span></li> - - - - - -<li><a href="AVRTimerSetup.html" class="refentry">AVRTimerSetup</a> — <span class="refentry-description">Function to setup Timers in ATmega16</span></li> - - - - - -<li><a href="AVRUARTReceive.html" class="refentry">AVRUARTReceive</a> — <span class="refentry-description">Function to Receive Char value send to ATmega16 using UART or USART.</span></li> - - - - - -<li><a href="AVRUARTSetup.html" class="refentry">AVRUARTSetup</a> — <span class="refentry-description">Function to Setup Serial Communication i.e UART or USART in ATmega16.</span></li> - - - - - -<li><a href="AVRUARTTransmit.html" class="refentry">AVRUARTTransmit</a> — <span class="refentry-description">Function to Transmit data using UART or USART.</span></li> - - - - - -<li><a href="CV_AdaptiveThreshold.html" class="refentry">CV_AdaptiveThreshold</a> — <span class="refentry-description">function to adaptively threshold input image</span></li> - - - - - -<li><a href="CV_Blur.html" class="refentry">CV_Blur</a> — <span class="refentry-description">function to blur image using normalised box filter</span></li> - - - - - -<li><a href="CV_Canny.html" class="refentry">CV_Canny</a> — <span class="refentry-description">Finds edges in image using Canny algorithm</span></li> - - - - - -<li><a href="CV_CornerHarris.html" class="refentry">CV_CornerHarris</a> — <span class="refentry-description">Finds edges in image using Harris algorithm</span></li> - - - - - -<li><a href="CV_CreateImage.html" class="refentry">CV_CreateImage</a> — <span class="refentry-description">function to create an image object of given size and type</span></li> - - - - - -<li><a href="CV_CvtColor.html" class="refentry">CV_CvtColor</a> — <span class="refentry-description">function to convert image from one colorspace to other colorspace</span></li> - - - - - -<li><a href="CV_Dilate.html" class="refentry">CV_Dilate</a> — <span class="refentry-description">dilates an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_DistanceTransform.html" class="refentry">CV_DistanceTransform</a> — <span class="refentry-description">function to calculate distance to closest zero pixels for each pixel</span></li> - - - - - -<li><a href="CV_Erode.html" class="refentry">CV_Erode</a> — <span class="refentry-description">Erodes an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_GaussianBlur.html" class="refentry">CV_GaussianBlur</a> — <span class="refentry-description">function to blur image using gaussian filter</span></li> - - - - - -<li><a href="CV_GetImgSize.html" class="refentry">CV_GetImgSize</a> — <span class="refentry-description">function to get size of the image (width*height)</span></li> - - - - - -<li><a href="CV_LoadImage.html" class="refentry">CV_LoadImage</a> — <span class="refentry-description">function to load an image object from given filename</span></li> - - - - - -<li><a href="CV_MedianBlur.html" class="refentry">CV_MedianBlur</a> — <span class="refentry-description">function to blur image using median filter</span></li> - - - - - -<li><a href="CV_SaveImage.html" class="refentry">CV_SaveImage</a> — <span class="refentry-description">function to save an image object as a given filename</span></li> - - - - - -<li><a href="CV_ShowImage.html" class="refentry">CV_ShowImage</a> — <span class="refentry-description">function to show an image</span></li> - - - - - -<li><a href="CV_Threshold.html" class="refentry">CV_Threshold</a> — <span class="refentry-description">function to threshold input image</span></li> - - - - - -<li><a href="CV_WaitKey.html" class="refentry">CV_WaitKey</a> — <span class="refentry-description">function similar to cvWaitKey</span></li></ul> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/section_473a2b9e79723ff76a7f243f85d2b6b8.html b/2.3-1/help/en_US/scilab_en_US_help/section_473a2b9e79723ff76a7f243f85d2b6b8.html deleted file mode 100644 index 647ce7ce..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/section_473a2b9e79723ff76a7f243f85d2b6b8.html +++ /dev/null @@ -1,259 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title></title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> Scilab 2 C Converter</span> - - <br /><br /> - <h3 class="title-part">Scilab 2 C Converter</h3> -<ul class="list-chapter"><li><a href="AVRADCSetup.html" class="refentry">AVRADCSetup</a> — <span class="refentry-description">Function to initialise ADC of AVR</span></li> - - - - - -<li><a href="AVRDigitalIn.html" class="refentry">AVRDigitalIn</a> — <span class="refentry-description">Function to get state (high\low) of a digital input pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalOut.html" class="refentry">AVRDigitalOut</a> — <span class="refentry-description">Function to change state (high\low) of a digital output pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalPortSetup.html" class="refentry">AVRDigitalPortSetup</a> — <span class="refentry-description">Function to decide direction of port on AVR</span></li> - - - - - -<li><a href="AVRDigitalSetup.html" class="refentry">AVRDigitalSetup</a> — <span class="refentry-description">Function to decide direction of a digital pin on AVR</span></li> - - - - - -<li><a href="AVRGetTimerValue.html" class="refentry">AVRGetTimerValue</a> — <span class="refentry-description">Function to get timer count</span></li> - - - - - -<li><a href="AVRPWM0SetDuty.html" class="refentry">AVRPWM0SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</span></li> - - - - - -<li><a href="AVRPWM0Setup.html" class="refentry">AVRPWM0Setup</a> — <span class="refentry-description">Function to Setup OC0 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM1SetDuty.html" class="refentry">AVRPWM1SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</span></li> - - - - - -<li><a href="AVRPWM1Setup.html" class="refentry">AVRPWM1Setup</a> — <span class="refentry-description">Function to Setup OC1A or OC1B pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM2SetDuty.html" class="refentry">AVRPWM2SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</span></li> - - - - - -<li><a href="AVRPWM2Setup.html" class="refentry">AVRPWM2Setup</a> — <span class="refentry-description">Function to Setup OC2 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRReadADC.html" class="refentry">AVRReadADC</a> — <span class="refentry-description">Function to get voltage on analog pin on AVR</span></li> - - - - - -<li><a href="AVRSleep.html" class="refentry">AVRSleep</a> — <span class="refentry-description">Function to pause the execution for the given time.</span></li> - - - - - -<li><a href="AVRTimerSetup.html" class="refentry">AVRTimerSetup</a> — <span class="refentry-description">Function to setup Timers in ATmega16</span></li> - - - - - -<li><a href="AVRUARTReceive.html" class="refentry">AVRUARTReceive</a> — <span class="refentry-description">Function to Receive Char value send to ATmega16 using UART or USART.</span></li> - - - - - -<li><a href="AVRUARTSetup.html" class="refentry">AVRUARTSetup</a> — <span class="refentry-description">Function to Setup Serial Communication i.e UART or USART in ATmega16.</span></li> - - - - - -<li><a href="AVRUARTTransmit.html" class="refentry">AVRUARTTransmit</a> — <span class="refentry-description">Function to Transmit data using UART or USART.</span></li> - - - - - -<li><a href="CV_AdaptiveThreshold.html" class="refentry">CV_AdaptiveThreshold</a> — <span class="refentry-description">function to adaptively threshold input image</span></li> - - - - - -<li><a href="CV_Blur.html" class="refentry">CV_Blur</a> — <span class="refentry-description">function to blur image using normalised box filter</span></li> - - - - - -<li><a href="CV_Canny.html" class="refentry">CV_Canny</a> — <span class="refentry-description">Finds edges in image using Canny algorithm</span></li> - - - - - -<li><a href="CV_CornerHarris.html" class="refentry">CV_CornerHarris</a> — <span class="refentry-description">Finds edges in image using Harris algorithm</span></li> - - - - - -<li><a href="CV_CreateImage.html" class="refentry">CV_CreateImage</a> — <span class="refentry-description">function to create an image object of given size and type</span></li> - - - - - -<li><a href="CV_CvtColor.html" class="refentry">CV_CvtColor</a> — <span class="refentry-description">function to convert image from one colorspace to other colorspace</span></li> - - - - - -<li><a href="CV_Dilate.html" class="refentry">CV_Dilate</a> — <span class="refentry-description">dilates an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_DistanceTransform.html" class="refentry">CV_DistanceTransform</a> — <span class="refentry-description">function to calculate distance to closest zero pixels for each pixel</span></li> - - - - - -<li><a href="CV_Erode.html" class="refentry">CV_Erode</a> — <span class="refentry-description">Erodes an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_GaussianBlur.html" class="refentry">CV_GaussianBlur</a> — <span class="refentry-description">function to blur image using gaussian filter</span></li> - - - - - -<li><a href="CV_GetImgSize.html" class="refentry">CV_GetImgSize</a> — <span class="refentry-description">function to get size of the image (width*height)</span></li> - - - - - -<li><a href="CV_LoadImage.html" class="refentry">CV_LoadImage</a> — <span class="refentry-description">function to load an image object from given filename</span></li> - - - - - -<li><a href="CV_MedianBlur.html" class="refentry">CV_MedianBlur</a> — <span class="refentry-description">function to blur image using median filter</span></li> - - - - - -<li><a href="CV_SaveImage.html" class="refentry">CV_SaveImage</a> — <span class="refentry-description">function to save an image object as a given filename</span></li> - - - - - -<li><a href="CV_ShowImage.html" class="refentry">CV_ShowImage</a> — <span class="refentry-description">function to show an image</span></li> - - - - - -<li><a href="CV_Threshold.html" class="refentry">CV_Threshold</a> — <span class="refentry-description">function to threshold input image</span></li> - - - - - -<li><a href="CV_WaitKey.html" class="refentry">CV_WaitKey</a> — <span class="refentry-description">function similar to cvWaitKey</span></li></ul> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/section_4d177ceb9ae128b1850140a7901a140a.html b/2.3-1/help/en_US/scilab_en_US_help/section_4d177ceb9ae128b1850140a7901a140a.html deleted file mode 100644 index 647ce7ce..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/section_4d177ceb9ae128b1850140a7901a140a.html +++ /dev/null @@ -1,259 +0,0 @@ -<html><head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title></title> - <style type="text/css" media="all"> - @import url("scilab_code.css"); - @import url("xml_code.css"); - @import url("c_code.css"); - @import url("style.css"); - </style> - </head> - <body> - <div class="manualnavbar"> - <table width="100%"><tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - - - - <span class="path"><a href="index.html">Scilab 2 C Converter</a> >> Scilab 2 C Converter</span> - - <br /><br /> - <h3 class="title-part">Scilab 2 C Converter</h3> -<ul class="list-chapter"><li><a href="AVRADCSetup.html" class="refentry">AVRADCSetup</a> — <span class="refentry-description">Function to initialise ADC of AVR</span></li> - - - - - -<li><a href="AVRDigitalIn.html" class="refentry">AVRDigitalIn</a> — <span class="refentry-description">Function to get state (high\low) of a digital input pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalOut.html" class="refentry">AVRDigitalOut</a> — <span class="refentry-description">Function to change state (high\low) of a digital output pin on AVR</span></li> - - - - - -<li><a href="AVRDigitalPortSetup.html" class="refentry">AVRDigitalPortSetup</a> — <span class="refentry-description">Function to decide direction of port on AVR</span></li> - - - - - -<li><a href="AVRDigitalSetup.html" class="refentry">AVRDigitalSetup</a> — <span class="refentry-description">Function to decide direction of a digital pin on AVR</span></li> - - - - - -<li><a href="AVRGetTimerValue.html" class="refentry">AVRGetTimerValue</a> — <span class="refentry-description">Function to get timer count</span></li> - - - - - -<li><a href="AVRPWM0SetDuty.html" class="refentry">AVRPWM0SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.</span></li> - - - - - -<li><a href="AVRPWM0Setup.html" class="refentry">AVRPWM0Setup</a> — <span class="refentry-description">Function to Setup OC0 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM1SetDuty.html" class="refentry">AVRPWM1SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.</span></li> - - - - - -<li><a href="AVRPWM1Setup.html" class="refentry">AVRPWM1Setup</a> — <span class="refentry-description">Function to Setup OC1A or OC1B pin for required PWM mode</span></li> - - - - - -<li><a href="AVRPWM2SetDuty.html" class="refentry">AVRPWM2SetDuty</a> — <span class="refentry-description">Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.</span></li> - - - - - -<li><a href="AVRPWM2Setup.html" class="refentry">AVRPWM2Setup</a> — <span class="refentry-description">Function to Setup OC2 pin for required PWM mode</span></li> - - - - - -<li><a href="AVRReadADC.html" class="refentry">AVRReadADC</a> — <span class="refentry-description">Function to get voltage on analog pin on AVR</span></li> - - - - - -<li><a href="AVRSleep.html" class="refentry">AVRSleep</a> — <span class="refentry-description">Function to pause the execution for the given time.</span></li> - - - - - -<li><a href="AVRTimerSetup.html" class="refentry">AVRTimerSetup</a> — <span class="refentry-description">Function to setup Timers in ATmega16</span></li> - - - - - -<li><a href="AVRUARTReceive.html" class="refentry">AVRUARTReceive</a> — <span class="refentry-description">Function to Receive Char value send to ATmega16 using UART or USART.</span></li> - - - - - -<li><a href="AVRUARTSetup.html" class="refentry">AVRUARTSetup</a> — <span class="refentry-description">Function to Setup Serial Communication i.e UART or USART in ATmega16.</span></li> - - - - - -<li><a href="AVRUARTTransmit.html" class="refentry">AVRUARTTransmit</a> — <span class="refentry-description">Function to Transmit data using UART or USART.</span></li> - - - - - -<li><a href="CV_AdaptiveThreshold.html" class="refentry">CV_AdaptiveThreshold</a> — <span class="refentry-description">function to adaptively threshold input image</span></li> - - - - - -<li><a href="CV_Blur.html" class="refentry">CV_Blur</a> — <span class="refentry-description">function to blur image using normalised box filter</span></li> - - - - - -<li><a href="CV_Canny.html" class="refentry">CV_Canny</a> — <span class="refentry-description">Finds edges in image using Canny algorithm</span></li> - - - - - -<li><a href="CV_CornerHarris.html" class="refentry">CV_CornerHarris</a> — <span class="refentry-description">Finds edges in image using Harris algorithm</span></li> - - - - - -<li><a href="CV_CreateImage.html" class="refentry">CV_CreateImage</a> — <span class="refentry-description">function to create an image object of given size and type</span></li> - - - - - -<li><a href="CV_CvtColor.html" class="refentry">CV_CvtColor</a> — <span class="refentry-description">function to convert image from one colorspace to other colorspace</span></li> - - - - - -<li><a href="CV_Dilate.html" class="refentry">CV_Dilate</a> — <span class="refentry-description">dilates an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_DistanceTransform.html" class="refentry">CV_DistanceTransform</a> — <span class="refentry-description">function to calculate distance to closest zero pixels for each pixel</span></li> - - - - - -<li><a href="CV_Erode.html" class="refentry">CV_Erode</a> — <span class="refentry-description">Erodes an image by using a specific structuring element.</span></li> - - - - - -<li><a href="CV_GaussianBlur.html" class="refentry">CV_GaussianBlur</a> — <span class="refentry-description">function to blur image using gaussian filter</span></li> - - - - - -<li><a href="CV_GetImgSize.html" class="refentry">CV_GetImgSize</a> — <span class="refentry-description">function to get size of the image (width*height)</span></li> - - - - - -<li><a href="CV_LoadImage.html" class="refentry">CV_LoadImage</a> — <span class="refentry-description">function to load an image object from given filename</span></li> - - - - - -<li><a href="CV_MedianBlur.html" class="refentry">CV_MedianBlur</a> — <span class="refentry-description">function to blur image using median filter</span></li> - - - - - -<li><a href="CV_SaveImage.html" class="refentry">CV_SaveImage</a> — <span class="refentry-description">function to save an image object as a given filename</span></li> - - - - - -<li><a href="CV_ShowImage.html" class="refentry">CV_ShowImage</a> — <span class="refentry-description">function to show an image</span></li> - - - - - -<li><a href="CV_Threshold.html" class="refentry">CV_Threshold</a> — <span class="refentry-description">function to threshold input image</span></li> - - - - - -<li><a href="CV_WaitKey.html" class="refentry">CV_WaitKey</a> — <span class="refentry-description">function similar to cvWaitKey</span></li></ul> - <br /> - - <div class="manualnavbar"> - <table width="100%"> - <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> -<tr> - <td width="30%"> - - </td> - <td width="40%" class="center"> - <span class="top"><a href="index.html">Scilab 2 C Converter</a></span> - - </td> - <td width="30%" class="next"> - - </td> - </tr></table> - <hr /> - </div> - </body> -</html> diff --git a/2.3-1/help/en_US/scilab_en_US_help/style.css b/2.3-1/help/en_US/scilab_en_US_help/style.css deleted file mode 100644 index 0fe8923d..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/style.css +++ /dev/null @@ -1,350 +0,0 @@ -body { - color:#000000; - background-color:#ffffff; - font-family:sans-serif; - font-size:100%; - margin:5px; - padding:0; - background : url("/img/body.png"); - background-repeat : repeat-x; -} - -.para { - padding-left: 10px; -} - -.refname { - color: #ff6c0a; -} -.refpurpose { - font-size: 110%; -} - -.synopsis { - border: 1px solid black; - width:80%; - padding: 0.5em; -} - -.editbar { - text-align: right; -} - -.term { - color:#800000; - font-size:100%; -} - -h3 { - color: #000063; - font-weight: bold; - font-size:130%; - margin-bottom: 10px; -} - -.programlisting { - font-family: monospace; - font-size: 100%; - background-color:#EEEEFF; - border-color:#CCCCCC; - border-style:solid; - border-width:2px medium; - width:80%; - color:#333333; - line-height:120%; - padding:10px; -} - -.literal { - font-family: monospace; - font-size: 100%; -} - -.option { - font-family: monospace; - font-style: italic; - font-size: 100%; -} - -.command { - font-family: monospace; - font-size: 100%; - color: #32b9b9; -} - -.function { - font-family: monospace; - font-size: 100%; - color: #32b9b9; -} - -.varname { - font-family: monospace; - font-weight: bold; - font-size: 100%; -} - -.constant { - font-family: monospace; - font-size: 100%; - color: #da70d6; -} - -a { - color: blue; - text-decoration:none; -} - -a:hover { - text-decoration:underline; -} - -.itemizedlist { - list-style-type: disk; -} - -.inline-list li { - display: inline; - list-style-type: disk; -} - -.vert-list { - list-style-type: disk; -} - -pre { - margin-bottom: 0px; - margin-top: 0px; -} - -.leftpart { - position:absolute; - float:left; - width: 186px; - padding: 5px; - font-size: smaller; -} - -.content { - margin-top: 100px; - margin-left: 196px -} - -.container { - margin: 0 auto; - width:1024px; -} - -ul.toc li.list-active { - list-style-type:disc; - font-weight:bold; -} - -ul.toc li.parent { - font-size: 115%; - padding: 5px 0px 5px 11px; - border-bottom: 1px solid #cccccc; - margin-bottom: 5px; -} - -ul.toc li.root { - font-size: 135%; - padding: 5px 0px 5px 11px; - border-bottom: 1px solid #cccccc; - margin-bottom: 5px; -} - -ul.toc li { - font-size: 85%; - margin: 1px 0 1px 1px; - padding: 1px 0 1px 11px; - background-repeat: no-repeat; - background-position: center left; - list-style-type: circle; -} - -.next { - float:right; - text-align: right; -} - -.center { - text-align: center; -} - -.screen { - font-family: monospace; - font-size: 100%; - background-color:#FFFFFF; - border-color:#CCCCCC; - border-style:solid; - border-width:2px medium; - width:80%; - color:#333333; - line-height:120%; - padding:10px; -} - -/* Top and bottom navigation controls on manual pages --------------------- */ -div.manualnavbar { - background-color: #E0E0E0; - color: inherit; - padding: 4px; - margin-bottom: 10px; -} -div.manualnavbar .prev { - padding-right: 4px; -} -div.manualnavbar .next { - text-align: right; - padding-left: 4px; -} - -div.manualnavbar .top { - text-align: center; - display: block; -} - -div.manualnavbar hr { - color: #cccccc; - background-color: #cccccc; -} - -/* Footer navigation area ------------------------------------------------- */ - -#pagefooter { - position: relative; - font-size: 75%; - color: inherit; - background-color: #e5e5e5; - width: 100%; -} - -#pagefooterleft { - top: 0px; - left: 0px; - padding: 6px; - margin-right: 30%; -} - -#pagefooterright { - text-align: right; - margin-left: 50%; - padding: 6px; -} -#footnav { - color: inherit; - background-color: #9999cc; - border-width: 1px 0px; - border-color: #333366; - border-style: solid; - text-align: right; - padding-right: 6px; -} - - - - - #global{ -/* width: 90%; */ - max-width: 90em; -/* min-width: 850px; */ - margin-left: auto; - margin-right: auto; - } - - #myHeader{ - background-color:#000000; - color:white; - margin-bottom : 10px; - position : relative; - text-align: center; -/* width : 1024px;*/ - height : 100px; - padding-left : 20px; - background : url("http://atoms.scilab.org/images/homepage/cadre_head.png"); - background-repeat : no-repeat; - background-position : 0px 0px; - - } - - #myFooter{ - background-color:#E5E5E5; - font-color:black; -/* width: 90%;*/ - max-width: 90em; -/* min-width: 850px; - margin-left: 5%; - margin-right: 5%;*/ - margin-top:10px; - padding:10px; - } - - #mainArea{ - width: 100%; - overflow: hidden; - } - - #myLeftArea{ - color:white; - float: left; - width: 180px; - padding:5px; - } - - #myMiddleArea{ - color:black; - margin-left: 200px; - padding: 10px 20px; - } - - #myRightArea{ - color:white; - float: right; - width: 200px; - padding: 12px 20px; - } - - -div#cadre_head -{ - position : relative; - text-align: center; -/* width : 1024px;*/ - height : 100px; - padding-left : 20px; - background : url("/img/cadre_head.png"); - background-repeat : no-repeat; - background-position : 0px 0px; -} - - -div#slogan{ - position: absolute; - top : 50px; - left:251px; - color:#0000AA; - font: 120%, Georgia,Serif; -} -div#cadre_help -{ - position: absolute; - top:45px; - right:0px; - font-size:0.8em; - color:#0000AA; -} - -table.revhistory -{ - width:80%; - border-color:#CCCCCC; - border-style:solid; - border-width:2px medium; - margin-bottom: 10px; -} - -table.revhistory tr.title td -{ - background-color: #9999CC; -}
\ No newline at end of file diff --git a/2.3-1/help/en_US/scilab_en_US_help/xml_code.css b/2.3-1/help/en_US/scilab_en_US_help/xml_code.css deleted file mode 100644 index 9e4c27f9..00000000 --- a/2.3-1/help/en_US/scilab_en_US_help/xml_code.css +++ /dev/null @@ -1,94 +0,0 @@ -.xmlcomment { - font-style: italic; - color: #01a801 -} - -.xmldefault { - font-style: normal; - color: #000000 -} - -.xmlentity { - font-style: normal; - color: #ffaa00 -} - -.xmlopeninstr { - font-style: normal; - color: #000000 -} - -.xmlcloseinstr { - font-style: normal; - color: #000000 -} - -.xmlinstrname { - font-style: normal; - color: #9965a6 -} - -.xmllowtag { - font-style: normal; - color: #000000 -} - -.xmltagname { - font-style: normal; - color: #0303ff -} - -.xmllowclose { - font-style: normal; - color: #000000 -} - -.xmlopencomment { - font-style: italic; - color: #01a801 -} - -.xmlcommentend { - font-style: italic; - color: #01a801 -} - -.xmlcomment { - font-style: italic; - color: #01a801 -} - -.xmlopencdata { - font-style: normal; - color: #c45555 -} - -.xmlcdataend { - font-style: normal; - color: #c45555 -} - -.xmlcdata { - font-style: normal; - color: #000000 -} - -.xmlattributename { - font-style: normal; - color: #9965a6 -} - -.xmlequal { - font-style: normal; - color: #000000 -} - -.xmlattributevalue { - font-style: normal; - color: #973964 -} - -.xmlautoclose { - font-style: normal; - color: #000000 -} diff --git a/2.3-1/includes/lapack.h b/2.3-1/includes/lapack.h index 9731026e..c5e4e680 100644 --- a/2.3-1/includes/lapack.h +++ b/2.3-1/includes/lapack.h @@ -196,8 +196,13 @@ extern doubleComplex zgesvd_( char* , char* , int* , int* ,doubleComplex *,\ int* , double* ,doubleComplex* , int* ,doubleComplex* , int* ,\ doubleComplex* , int* , double* , int* ); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +/*USed in QR decompsition*/ +extern double dgeqrf_(int *,int *,double *,int *,double *,double *,int *,int *); +extern double dgeqpf_(int *,int *,double *,int *,int *,double *,double *,int *); +extern double dorgqr_(int *,int *,int *,double *,int *,double *,double *,int *,int *); +extern void dlaset_(char *,int *,int *,double *,double *,double *,int *); + + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h index 34380bd5..80af0fe3 100644 --- a/2.3-1/includes/sci2clib.h +++ b/2.3-1/includes/sci2clib.h @@ -329,7 +329,7 @@ extern "C" { #include "int_secd.h" /*interfacing float*/ -#include "float.h" +#include "get_float.h" #include "int_float.h" /*interfacing factorial*/ @@ -467,6 +467,11 @@ extern "C" { #include "int_norm.h" #include "norm.h" +/*interface Toeplitz */ +#include "toeplitz.h" +#include "int_toeplitz.h" + + /* SIGNAL PROCESSING */ <<<<<<< HEAD @@ -689,12 +694,27 @@ extern "C" { #include "hess.h" /* Linear Algebra - Hess function */ #include "int_hess.h" -#include "sva.h" -#include "int_sva.h" /*Linear Algebra - SVA function */ -======= -#include "rcond.h" -#include "int_rcond.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +#include "sva.h" /* Linear Algebra - SVA function */ +#include "int_sva.h" + +#include "sqroot.h" /* Linear Algebra - Sqroot function */ +#include "int_sqroot.h" + +#include "givens.h" /* Linear Algebra - Givens Function */ +#include "int_givens.h" + +#include "householder.h" /* Linear Algebra - Householder function */ +#include "int_householder.h" + +#include "fullrf.h" /* Linear Algebra - Full rank factoziation */ +#include "int_fullrf.h" + +#include "rowcomp.h" /* Linear Algebra - row compression, range */ +#include "int_rowcomp.h" + + +#include "qr.h" /* Linear Algebra - QR decomposition */ +#include "int_qr.h" /*Functions related to opencv*/ /*#include "cvcore.hpp" @@ -761,7 +781,6 @@ extern "C" { /*RPi*/ #ifdef RPi1 #include "wiringPi.h" -<<<<<<< HEAD #include "RPIPeripheralDigital.h" #include "int_RPIPeripheralDigital.h" #include "RPIPeripheralGertboard.h" diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar Binary files differdeleted file mode 100644 index c57b4cb0..00000000 --- a/2.3-1/jar/scilab_en_US_help.jar +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.sci b/2.3-1/macros/ASTManagement/AST2Ccode.sci index b1646df3..5cceaf18 100644 --- a/2.3-1/macros/ASTManagement/AST2Ccode.sci +++ b/2.3-1/macros/ASTManagement/AST2Ccode.sci @@ -157,7 +157,6 @@ while ~meof(fidAST) [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation'); case 'EndFuncall' then [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall'); - disp(disp_isthere); ======= [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Operation'); case 'EndFuncall' then @@ -197,7 +196,6 @@ while ~meof(fidAST) AST_PushASTStack(treeline); case 'Lhs :' then <<<<<<< HEAD - disp(disp_isthere); if rc_count > 0 & cc_count == 0 SharedInfo.Equal.Lhs = 1; [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo); diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci index 6c2abed3..b5208e51 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -146,11 +146,10 @@ NOutArg_mod = NOutArg PrintStringInfo(' ',ReportFileName,'both','y'); error(9999, 'SCI2CERROR: Unexpected number of output arguments for global function.'); end -<<<<<<< HEAD - elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close') - SharedInfo.SkipNextFun = 1; -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //To skip the functions for Raspberry Pi connections + elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close' | ASTFunName == 'i2cdetect') + disp_isthere=1; // Skips the corresponding Lhs argument declaration + return // Skips the function call end // #RNU_RES_B @@ -158,17 +157,14 @@ NOutArg_mod = NOutArg // --- Read the function annotations. --- // -------------------------------------- // #RNU_RES_E -<<<<<<< HEAD if ASTFunName == '%k' ASTFunName='modk'; end if ASTFunName == '%sn' ASTFunName='modsn'; - end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 - + end + if (ASTFunName == 'OpEqual') FunTypeAnnot = ''; FunSizeAnnot = ''; @@ -181,10 +177,7 @@ NOutArg_mod = NOutArg // --- Search for Equal Lhs and precision specifier to be applied to the current function. --- // ------------------------------------------------------------------------------------------- // #RNU_RES_E -<<<<<<< HEAD PrintStringInfo(' no of out arguments' + string(NOutArg),ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 [LhsArg,NLhsArg,FunPrecSpecifier,SharedInfo] = AST_GetPrecAndLhsArg(OutArg,NOutArg,ASTFunName,FunTypeAnnot,FunSizeAnnot,ASTFunType,FileInfo,SharedInfo); //NUT: questa funzione contiene troppi parametri e mi sembra disordinata. @@ -382,7 +375,6 @@ NOutArg_mod = NOutArg OutArg(1).Name = string(OutArg(1).Value); elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) OutArg(1).Name = string(OutArg(1).Value); -<<<<<<< HEAD //elseif ASTFunName == 'disp' else [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); @@ -390,10 +382,10 @@ NOutArg_mod = NOutArg PrintStringInfo(' returning back due logical function',ReportFileName,'file','y'); return; end -======= + else [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + end if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) @@ -437,11 +429,8 @@ NOutArg_mod = NOutArg // Scope already set above. elseif (ASTFunName == 'double' & NInArg == 1 & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) // Scope already set above. -<<<<<<< HEAD //elseif ASTFunName == 'disp' //do nothing -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 else OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo); end @@ -460,11 +449,8 @@ NOutArg_mod = NOutArg //#RNUREM_ME A number is not inserted in the symbol table. elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) //#RNUREM_ME A number is not inserted in the symbol table. -<<<<<<< HEAD //elseif ASTFunName == 'disp' //do nothing -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 else ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all'); end @@ -497,7 +483,6 @@ NOutArg_mod = NOutArg // -------------------------------------------- //#RNU_RES_E //disp(OutArg,InArg,ASTFunName) -<<<<<<< HEAD CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); @@ -505,14 +490,14 @@ NOutArg_mod = NOutArg //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) -======= + CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) //disp(ASTFunName) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + if(IsArduinoSetupFunction(ASTFunName)) //If current function is an arduino setup function (like 'dc_motor_setup'), it //should not be converted and inserted here. It is inserted in a list now and @@ -533,12 +518,8 @@ NOutArg_mod = NOutArg else LibTypeInfo = 'USER2C'; end -<<<<<<< HEAD -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //#RNU_RES_B // ------------------------------------------------------------------------------------ // --- Check whether the function has been already called in the current .sci file. --- @@ -585,11 +566,8 @@ NOutArg_mod = NOutArg SharedInfo.SkipNextFun > 0 | ... ((sum(mtlb_strcmp(ASTFunName,SharedInfo.Annotations.DataPrec)) > 0) & (SharedInfo.SkipNextPrec == 1))) // Do nothing -<<<<<<< HEAD //elseif ASTFunName == 'disp' // Do nothing -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 else AST_CheckCommonInOutArgs(InArg,NInArg,OutArg,NOutArg,ReportFileName); end diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib Binary files differdeleted file mode 100644 index 51b54f6f..00000000 --- a/2.3-1/macros/ASTManagement/lib +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci index e2899bd9..dbdae9d3 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -70,11 +70,7 @@ else PrintStringInfo('CXX = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); -<<<<<<< HEAD - PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread',FileInfo.MakefileFilename,'file','y','y'); -======= - PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y'); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread -lRPIwfi',FileInfo.MakefileFilename,'file','y','y'); else PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y'); @@ -82,7 +78,6 @@ else PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); end -<<<<<<< HEAD //If ode function is used, add libgsl. if(size(SharedInfo.Includelist) <> 0) @@ -102,8 +97,6 @@ else PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(SharedInfo.OpenCVUsed == %T) PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci index 4d899717..619c4931 100644 --- a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci +++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci @@ -90,7 +90,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); SCI2CClassFileName = fullfile(FileInfo.SCI2CLibSCIAnnCls,SCI2CClassName+'.acls'); end - if (FlagFoundAnnFile == 0) [FlagFoundAnnFile,fullpathscifilename] = SCI2CFindFile(FileInfo.UserSciFilesPaths,FunName+'.sci'); if (FlagFoundAnnFile == 0) diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib Binary files differdeleted file mode 100644 index 4ee8cb6c..00000000 --- a/2.3-1/macros/CCodeGeneration/lib +++ /dev/null diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib Binary files differdeleted file mode 100644 index 2994abce..00000000 --- a/2.3-1/macros/ErrorMessages/lib +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib Binary files differdeleted file mode 100644 index 0e229452..00000000 --- a/2.3-1/macros/FunctionAnnotation/lib +++ /dev/null diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib Binary files differdeleted file mode 100644 index 8f8320c2..00000000 --- a/2.3-1/macros/FunctionList/lib +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib Binary files differdeleted file mode 100644 index 7fe75a20..00000000 --- a/2.3-1/macros/GeneralFunctions/lib +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib Binary files differdeleted file mode 100644 index a3d9e10c..00000000 --- a/2.3-1/macros/Hardware/AVR/lib +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib Binary files differdeleted file mode 100644 index ac87d042..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/lib +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib Binary files differdeleted file mode 100644 index efaf5182..00000000 --- a/2.3-1/macros/ImageProcessing/core/lib +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib Binary files differdeleted file mode 100644 index 722a1503..00000000 --- a/2.3-1/macros/ImageProcessing/highgui/lib +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib Binary files differdeleted file mode 100644 index 1f0925a0..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/lib +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib Binary files differdeleted file mode 100644 index 64a3fce4..00000000 --- a/2.3-1/macros/Scilab-Arduino/lib +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib Binary files differdeleted file mode 100644 index 2c57d672..00000000 --- a/2.3-1/macros/SymbolTable/lib +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 7485f045..67051512 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -302,6 +302,7 @@ PrintStringInfo('i80'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('u160'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('i160'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('z0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('u82'+ArgSeparator+'s2',ClassFileName,'file','y');
@@ -317,7 +318,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
// ---------------------
// --- Class Int8. ---
// ---------------------
@@ -437,7 +437,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// ---------------------
// --- Class Uint32. ---
@@ -514,8 +514,8 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ------------------
// --- Class Sin. ---
// ------------------
@@ -923,7 +923,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Class Isreal. ---
// -------------------
ClassName = 'Isreal';
@@ -1130,8 +1130,8 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // -------------------
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Sqrt. ---
// -------------------
ClassName = 'Sqrt';
@@ -1491,13 +1491,13 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('s2s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
@@ -4535,6 +4535,57 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class TOEPLITZ ----------------
+//------------------------------------
+ClassName = 'toeplitz';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('u82u82'+ArgSeparator+'u82',ClassFileName,'file','y');
+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
+PrintStringInfo('u162u162'+ArgSeparator+'u162',ClassFileName,'file','y');
+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
+PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('c2c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('i82i82'+ArgSeparator+'i82',ClassFileName,'file','y');
+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'toeplitz';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
// -------------------
// --- Class Spec. ---
// -------------------
@@ -4558,7 +4609,7 @@ PrintStringInfo('OUT(2).TP= FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y' PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
// Edited by Sandeep Gupta, IITB FOSSEE Project.
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -4610,7 +4661,7 @@ PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-======= +=======
// --- Function List Class. ---
//NUT: no mixed data types
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
@@ -4619,7 +4670,7 @@ PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -4640,15 +4691,15 @@ PrintStringInfo('d2'+ArgSeparator+'z2z2',ClassFileName,'file','y'); PrintStringInfo('c2'+ArgSeparator+'c2c2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2z2',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('d2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2z2',ClassFileName,'file','y');
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'spec'; // AS : Done AS : Float_Done
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -4843,10 +4894,10 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y');
-<<<<<<< HEAD -======= +<<<<<<< HEAD
+=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'cmd_analog_out';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -5720,12 +5771,12 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD -======= +<<<<<<< HEAD
+=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//------------------------------------
//---- Class AVRUARTReceiveChar -----------
//------------------------------------
@@ -5742,11 +5793,11 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD -======= +<<<<<<< HEAD
+=======
//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5757,52 +5808,52 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_Void ----------
//------------------------------------
ClassName = 'RPI_0IN_Void';
-======= +=======
//------------------------------------
//---- Class RPI_DigitalSetup --------
//------------------------------------
ClassName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
-<<<<<<< HEAD +<<<<<<< HEAD
FunctionName = 'RPI_gertBoardSPISetup';
-======= +=======
FunctionName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_u8 ------------
//------------------------------------
@@ -5827,47 +5878,47 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_digitalReadByte';
-======= +=======
FunctionName = 'RPI_DigitalOut';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_HardPWMWrite';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_0IN_u32 -----------
//------------------------------------
ClassName = 'RPI_0IN_u32';
-======= +=======
//---- Class RPI_DigitalIn -----------
//------------------------------------
ClassName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo(''+ArgSeparator+'u320',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5876,19 +5927,19 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_micros';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u8_Void -------
//------------------------------------
ClassName = 'RPI_1IN_u8_Void';
@@ -5898,7 +5949,7 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-======= +=======
//---- Class RPI_DelayMilli ----------
//------------------------------------
ClassName = 'RPI_DelayMilli';
@@ -5908,15 +5959,16 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_digitalWriteByte';
@@ -5948,7 +6000,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneStop';
-======= +=======
//--- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
@@ -5986,45 +6038,46 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_HardPWMSetMode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u16_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u16_Void';
-======= +=======
//---- Class RPI_GetMilli ----------
//------------------------------------
ClassName = 'RPI_GetMilli';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmClock';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
@@ -6035,41 +6088,42 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_GetMicros';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u32_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u32_Void';
-======= +=======
//---- Class RPI_SetupSerial ----------
//------------------------------------
ClassName = 'RPI_SetupSerial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmRange';
@@ -6081,19 +6135,19 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_delayMicro';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_SerialSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_g_Void --------
//------------------------------------
ClassName = 'RPI_1IN_g_Void';
@@ -6121,7 +6175,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class RPI_1IN_u8_i8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_i8';
-======= +=======
//---- Class RPI_SetupClose ----------
//------------------------------------
//ClassName = 'RPI_SetupClose';
@@ -6154,27 +6208,28 @@ ClassName = 'RPI_1IN_u8_i8'; //---- Class RPI_SerialSendData ----------
//------------------------------------
ClassName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CSetup';
@@ -6186,7 +6241,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_physToGpio';
-======= +=======
PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
PrintStringInfo('u80i80'+ArgSeparator+'u80',ClassFileName,'file','y');
@@ -6205,40 +6260,41 @@ PrintStringInfo('u80g2'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u16_i8 --------
//------------------------------------
ClassName = 'RPI_1IN_u16_i8';
-======= +=======
//---- Class RPI_SerialDataAvail ----------
//------------------------------------
ClassName = 'RPI_SerialDataAvail';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CRead';
@@ -6250,7 +6306,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_sn3218Setup';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
@@ -6260,86 +6316,87 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_SerialGetChar';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class RPI_1IN_g_i8 ----------
//------------------------------------
ClassName = 'RPI_1IN_g_i8';
-======= +=======
//------------------------------------
//---- Class RPI_ThreadCreate ----------
//------------------------------------
ClassName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('g2'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinNumbering';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u8_u8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_u8';
-======= +=======
//---- Class RPI_PinISR --------------
//------------------------------------
ClassName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_getAlt';
@@ -6355,32 +6412,32 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneCreate';
-======= +=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u16_u16 -------
//------------------------------------
ClassName = 'RPI_1IN_u16_u16';
-======= +=======
//---- Class ODE ---------------------
//------------------------------------
ClassName = 'ODE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
@@ -6390,10 +6447,11 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_gertboardAnalogRead';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -6458,26 +6516,26 @@ PrintStringInfo('d2d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'ode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RPI_1IN_u8_g ------
//------------------------------------
ClassName = 'RPI_1IN_u8_g';
-======= +=======
//---- Class CUMSUM ---------------------
//------------------------------------
ClassName = 'CUMSUM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
@@ -6487,6 +6545,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_serialGetchar';
@@ -6508,6 +6567,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinModeAlt';
@@ -6572,6 +6632,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmWrite';
@@ -6604,6 +6665,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_gertboardAnalogWrite';
@@ -6628,6 +6690,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80g2'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0g2'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinMode';
@@ -6672,6 +6735,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_softToneWrite';
@@ -6696,6 +6760,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80i160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_waitForInterrupt';
@@ -6720,6 +6785,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CWrite';
@@ -6752,6 +6818,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('g2u320'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('g2d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_serialOpen';
@@ -6776,6 +6843,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pcf8574Setup';
@@ -6813,6 +6881,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdPosition';
@@ -6838,6 +6907,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CWriteReg8';
@@ -6863,6 +6933,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_shiftIn';
@@ -6887,6 +6958,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_softPwmCreate';
@@ -6911,6 +6983,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_mcp23s08Setup';
@@ -6939,6 +7012,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_shiftOut';
@@ -6963,6 +7037,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u80u80u80u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_sr595Setup';
@@ -6987,6 +7062,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdCharDef';
@@ -7011,6 +7087,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdInit';
@@ -7889,7 +7966,7 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'syslin';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -7933,37 +8010,37 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'cumprod';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class schur -------------------
//------------------------------------
ClassName = 'SCHUR';
-======= +=======
//---- Class TRIU ---------------------
//------------------------------------
ClassName = 'TRIU';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD -======= +<<<<<<< HEAD
+=======
//Arguements specified: initial value, start time, time vector, ode function
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8198,7 +8275,7 @@ PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'obscont';
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8248,27 +8325,336 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'tril';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class SQROOT ---------------------
+//------------------------------------
+ClassName = 'SQROOT';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'sqroot';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class GIVENS ---------------------
+//------------------------------------
+ClassName = 'GIVENS';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'givens';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class HOUSEHOLDER---------------------
+//------------------------------------
+ClassName = 'HOUSEHOLDER';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'householder';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class FULLRF---------------------
+//------------------------------------
+ClassName = 'FULLRF';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'fullrf';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class ROWCOMP ---------------------
+//------------------------------------
+ClassName = 'ROWCOMP';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 3',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2g2d0'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'rowcomp';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class QR---------------------
+//------------------------------------
+ClassName = 'QR';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d0d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d0d2',ClassFileName,'file','y');
+
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'qr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class svd ---------------------
//------------------------------------
ClassName = 'SVD';
-======= +=======
//---- Class KRON --------------------
//------------------------------------
ClassName = 'KRON';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8293,8 +8679,8 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -8323,11 +8709,41 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= ''d''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -8336,10 +8752,12 @@ PrintStringInfo('d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y'); PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('z2g2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'svd';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8362,29 +8780,29 @@ PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'kron';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class HESS ---------------------
//------------------------------------
ClassName = 'HESS';
-======= +=======
//------------------------------------
//---- Class FLIPDIM -----------------
//------------------------------------
ClassName = 'FLIPDIM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8406,7 +8824,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'hess';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8452,31 +8870,30 @@ PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'flipdim';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD -
+<<<<<<< HEAD
//------------------------------------
//---- Class SVA ---------------------
//------------------------------------
ClassName = 'SVA';
-======= +=======
//------------------------------------
//---- Class DIFF -----------------
//------------------------------------
ClassName = 'DIFF';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -8492,7 +8909,7 @@ PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_U_SVA(IN(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
@@ -8506,7 +8923,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-======= +=======
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,''1'',''0''))',ClassFileName,'file','y');
@@ -8558,28 +8975,29 @@ PrintStringInfo('i162u160d0'+ArgSeparator+'i162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'diff';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class balanc ------------------
//------------------------------------
ClassName = 'BALANC';
-======= +=======
//---- Class NORM --------------------
//------------------------------------
ClassName = 'NORM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -8609,7 +9027,7 @@ PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'balanc';
-======= +=======
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
@@ -8637,21 +9055,21 @@ PrintStringInfo('s2g2'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'norm';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class RCOND -------------------
//------------------------------------
ClassName = 'RCOND';
-======= +=======
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -8659,7 +9077,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -8669,7 +9087,7 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'rcond';
-======= +=======
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -8689,13 +9107,13 @@ PrintStringInfo('g2g0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
@@ -8724,7 +9142,7 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
-======= +=======
//---- Class cvCreateImage --------------------
//------------------------------------
ClassName = 'CV_CreateImage';
@@ -8744,27 +9162,27 @@ PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CreateImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class STRSUBST --------------------
//------------------------------------
ClassName = 'STRSUBST';
-======= +=======
//---- Class cvLoadImage --------------------
//------------------------------------
ClassName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8785,7 +9203,7 @@ PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strsubst';
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -8797,29 +9215,29 @@ PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class STRCMP --------------------
//------------------------------------
ClassName = 'STRCMP';
-======= +=======
//------------------------------------
//---- Class cvShowImage -------------
//------------------------------------
ClassName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8841,7 +9259,7 @@ PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strcmp';
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -8860,19 +9278,19 @@ PrintStringInfo('mt0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class STRREV --------------------
//------------------------------------
ClassName = 'STRREV';
-======= +=======
FunctionName = 'CV_SaveImage';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
@@ -8882,13 +9300,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_WaitKey --------------
//------------------------------------
ClassName = 'CV_WaitKey';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8913,7 +9331,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRRCHR --------------------
//------------------------------------
ClassName = 'STRRCHR';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -8938,13 +9356,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_CvtColor -------------
//------------------------------------
ClassName = 'CV_CvtColor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8959,7 +9377,7 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); FunctionName = 'strrchr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -8972,26 +9390,26 @@ PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CvtColor';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class STRCHR --------------------
//------------------------------------
ClassName = 'STRCHR';
-======= +=======
//---- Class CV_GetImgSize -----------
//------------------------------------
ClassName = 'CV_GetImgSize';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9015,7 +9433,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRNCPY --------------------
//------------------------------------
ClassName = 'STRNCPY';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -9035,13 +9453,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_Threshold -----------
//------------------------------------
ClassName = 'CV_Threshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9065,7 +9483,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRSPN --------------------
//------------------------------------
ClassName = 'STRSPN';
-======= +=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9085,27 +9503,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_AdaptiveThreshold -----------
//------------------------------------
ClassName = 'CV_AdaptiveThreshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 6',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9121,7 +9539,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRCSPN --------------------
//------------------------------------
ClassName = 'STRCSPN';
-======= +=======
PrintStringInfo('mt0d0g2g2d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9134,27 +9552,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_DistanceTransform ----
//------------------------------------
ClassName = 'CV_DistanceTransform';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9172,7 +9590,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class ASCII --------------------
//------------------------------------
ClassName = 'ASCII';
-======= +=======
PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9185,13 +9603,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_Blur -----------------
//------------------------------------
ClassName = 'CV_Blur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9222,7 +9640,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class DEC2BIN --------------------
//------------------------------------
ClassName = 'DEC2BIN';
-======= +=======
PrintStringInfo('NIN= 6',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9247,13 +9665,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class CV_MedianBlur -----------------
//------------------------------------
ClassName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9295,7 +9713,7 @@ PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2bin';
-======= +=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9307,12 +9725,12 @@ PrintStringInfo('mt0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
@@ -9351,7 +9769,7 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2base';
-======= +=======
//------------------------------------
//---- Class CV_Dilate ---------------
//------------------------------------
@@ -9384,27 +9802,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'CV_Erode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class DEC2OCT --------------------
//------------------------------------
ClassName = 'DEC2OCT';
-======= +=======
//---- Class CV_Canny ----------------
//------------------------------------
ClassName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9428,7 +9846,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2oct';
-======= +=======
PrintStringInfo('NIN= 5',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9447,30 +9865,30 @@ PrintStringInfo('mt0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class DEC2HEX --------------------
//------------------------------------
ClassName = 'DEC2HEX';
-======= +=======
//------------------------------------
//---- Class CV_CornerHarris ----------------
//------------------------------------
ClassName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9494,7 +9912,7 @@ PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2hex';
-======= +=======
PrintStringInfo('NIN= 5',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9513,29 +9931,29 @@ PrintStringInfo('mt0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class BIN2DEC --------------------
//------------------------------------
ClassName = 'BIN2DEC';
-======= +=======
//------------------------------------
//---- Class syslin ------------------
//------------------------------------
ClassName = 'SYSLIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9558,7 +9976,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'bin2dec';
-======= +=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y');
@@ -9601,21 +10019,21 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'syslin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class SVD -------------------
//------------------------------------
ClassName = 'SVD';
-======= +=======
//---- Class schur -------------------
//------------------------------------
ClassName = 'SCHUR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -9624,7 +10042,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -9687,7 +10105,7 @@ PrintStringInfo('NOUT= 4',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -9732,12 +10150,12 @@ PrintStringInfo('NOUT= 4',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
@@ -9811,7 +10229,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-======= +=======
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
@@ -9893,30 +10311,30 @@ PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y'); PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'schur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class OCT2DEC --------------------
//------------------------------------
ClassName = 'OCT2DEC';
-======= +=======
//------------------------------------
//---- Class lqr ---------------------
//------------------------------------
ClassName = 'LQR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9939,7 +10357,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'oct2dec';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -9954,27 +10372,27 @@ PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'lqr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class HEX2DEC --------------------
//------------------------------------
ClassName = 'HEX2DEC';
-======= +=======
//---- Class lqe ---------------------
//------------------------------------
ClassName = 'LQE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9988,7 +10406,7 @@ PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hex2dec';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10003,29 +10421,29 @@ PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'lqe';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class BASE2DEC --------------------
//------------------------------------
ClassName = 'BASE2DEC';
-======= +=======
//------------------------------------
//---- Class obscont -----------------
//------------------------------------
ClassName = 'OBSCONT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10096,7 +10514,7 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cotd';
-======= +=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10118,28 +10536,28 @@ PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'obscont';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// ------------------
// --- Class Coth. ---
// ------------------
ClassName = 'Coth';
-======= +=======
//------------------------------------
//---- Class balanc ------------------
//------------------------------------
ClassName = 'BALANC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10225,7 +10643,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cscd';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -10257,29 +10675,29 @@ PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'balanc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// ------------------
// --- Class Csch. ---
// ------------------
ClassName = 'Csch';
-======= +=======
//------------------------------------
//---- Class RCOND -------------------
//------------------------------------
ClassName = 'RCOND';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10300,7 +10718,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'csch';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10313,40 +10731,40 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'rcond';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Class Sec. ---
// ------------------
ClassName = 'Sec';
-======= +=======
//------------------------------------
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10361,7 +10779,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sec';
-======= +=======
//PrintStringInfo('NIN= 2',ClassFileName,'file','y');
//PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
//PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10375,41 +10793,41 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// ------------------
// --- Class Secd. ---
// ------------------
ClassName = 'Secd';
-======= +=======
//------------------------------------
//---- Class STRSUBST --------------------
//------------------------------------
ClassName = 'STRSUBST';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -10419,7 +10837,7 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'secd';
-======= +=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10433,41 +10851,41 @@ PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strsubst';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Class Sech. ---
// ------------------
ClassName = 'Sech';
-======= +=======
//------------------------------------
//---- Class STRCMP --------------------
//------------------------------------
ClassName = 'STRCMP';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10482,7 +10900,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sech';
-======= +=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10497,7 +10915,7 @@ PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strcmp';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -10505,15 +10923,15 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class FACTORIAL --------------------
//------------------------------------
ClassName = 'FACTORIAL';
-======= +=======
//---- Class STRREV --------------------
//------------------------------------
ClassName = 'STRREV';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10526,7 +10944,7 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
@@ -10537,7 +10955,7 @@ PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factorial';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-======= +=======
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
@@ -10546,27 +10964,27 @@ PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y'); FunctionName = 'strrev';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Class Interp1. ---
// ------------------
ClassName = 'Interp1';
-======= +=======
//------------------------------------
//---- Class STRRCHR --------------------
//------------------------------------
ClassName = 'STRRCHR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10589,7 +11007,7 @@ PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'interp1';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -10605,27 +11023,27 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); FunctionName = 'strrchr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
// --- Class Modk. ---
// ------------------
ClassName = 'Modk';
-======= +=======
//------------------------------------
//---- Class DEC2BIN --------------------
//------------------------------------
ClassName = 'DEC2BIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10645,7 +11063,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -10688,30 +11106,30 @@ PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2bin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class PRIMES --------------------
//------------------------------------
ClassName = 'PRIMES';
-======= +=======
//------------------------------------
//---- Class DEC2BASE --------------------
//------------------------------------
ClassName = 'DEC2BASE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10726,7 +11144,7 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'primes';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10754,23 +11172,23 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2base';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-======= +=======
//------------------------------------
//---- Class DEC2OCT --------------------
//------------------------------------
ClassName = 'DEC2OCT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10780,7 +11198,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10790,7 +11208,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-======= +=======
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2OCT(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10810,7 +11228,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2oct';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -10818,15 +11236,15 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class LCM --------------------
//------------------------------------
ClassName = 'LCM';
-======= +=======
//---- Class DEC2HEX --------------------
//------------------------------------
ClassName = 'DEC2HEX';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10835,7 +11253,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10846,7 +11264,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'lcm';
-======= +=======
PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2HEX(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10867,13 +11285,13 @@ PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2hex';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
@@ -10883,12 +11301,12 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class FACTOR --------------------
//------------------------------------
ClassName = 'FACTOR';
-======= +=======
//------------------------------------
//---- Class BIN2DEC --------------------
//------------------------------------
ClassName = 'BIN2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10897,7 +11315,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_FACTOR(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10909,7 +11327,7 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factor';
-======= +=======
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -10929,24 +11347,24 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'bin2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-======= +=======
//------------------------------------
//---- Class OCT2DEC --------------------
//------------------------------------
ClassName = 'OCT2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10955,7 +11373,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10966,7 +11384,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-======= +=======
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -10986,30 +11404,30 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'oct2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class ZPBUTT --------------------
//------------------------------------
ClassName = 'ZPBUTT';
-======= +=======
//------------------------------------
//---- Class HEX2DEC --------------------
//------------------------------------
ClassName = 'HEX2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11027,7 +11445,7 @@ PrintStringInfo('d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpbutt';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11041,28 +11459,28 @@ PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hex2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class ZPCH1 --------------------
//------------------------------------
ClassName = 'ZPCH1';
-======= +=======
//---- Class BASE2DEC --------------------
//------------------------------------
ClassName = 'BASE2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11080,7 +11498,7 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpch1';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11095,28 +11513,28 @@ PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); //PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'base2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class ZPCH2 --------------------
//------------------------------------
ClassName = 'ZPCH2';
-======= +=======
// ------------------
// --- Class Cosd. ---
// ------------------
ClassName = 'Cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11139,7 +11557,7 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpch2';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11155,28 +11573,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class BUTTMAG --------------------
//------------------------------------
ClassName = 'BUTTMAG';
-======= +=======
// ------------------
// --- Class Cotd. ---
// ------------------
ClassName = 'Cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11195,7 +11613,7 @@ PrintStringInfo('u80u80d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'buttmag';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11211,28 +11629,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class CHEB1MAG --------------------
//------------------------------------
ClassName = 'CHEB1MAG';
-======= +=======
// ------------------
// --- Class Coth. ---
// ------------------
ClassName = 'Coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11251,7 +11669,7 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cheb1mag';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11271,28 +11689,28 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class CHEB2MAG --------------------
//------------------------------------
ClassName = 'CHEB2MAG';
-======= +=======
// ------------------
// --- Class Csc. ---
// ------------------
ClassName = 'Csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11311,7 +11729,7 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cheb2mag';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11331,44 +11749,44 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class SINC --------------------
//------------------------------------
ClassName = 'SINC';
-======= +=======
// ------------------
// --- Class Cscd. ---
// ------------------
ClassName = 'Cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD +<<<<<<< HEAD
@@ -11379,7 +11797,7 @@ PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sinc';
-======= +=======
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -11394,30 +11812,30 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class SINCD --------------------
//------------------------------------
ClassName = 'SINCD';
-======= +=======
// ------------------
// --- Class Csch. ---
// ------------------
ClassName = 'Csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11437,7 +11855,7 @@ PrintStringInfo('u80u80'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sincd';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11458,29 +11876,29 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class FSFIRLIN --------------------
//------------------------------------
ClassName = 'FSFIRLIN';
-======= +=======
// --- Class Sec. ---
// ------------------
ClassName = 'Sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11499,7 +11917,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'fsfirlin';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11520,30 +11938,30 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class %K --------------------
//------------------------------------
ClassName = 'modk';
-======= +=======
// ------------------
// --- Class Secd. ---
// ------------------
ClassName = 'Secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -11562,7 +11980,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11578,28 +11996,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class FILT_SINC --------------------
//------------------------------------
ClassName = 'FILT_SINC';
-======= +=======
// --- Class Sech. ---
// ------------------
ClassName = 'Sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11618,7 +12036,7 @@ PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'filt_sinc';
-======= +=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11639,7 +12057,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -11647,21 +12065,21 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class FFILT --------------------
//------------------------------------
ClassName = 'FFILT';
-======= +=======
//---- Class FACTORIAL --------------------
//------------------------------------
ClassName = 'FACTORIAL';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11679,7 +12097,7 @@ PrintStringInfo('g2d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'ffilt';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11696,28 +12114,28 @@ PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factorial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class %SN --------------------
//------------------------------------
ClassName = 'modsn';
-======= +=======
// --- Class Interp1. ---
// ------------------
ClassName = 'Interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
//PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11752,7 +12170,7 @@ PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modsn';
-======= +=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -11773,34 +12191,34 @@ PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
//------------------------------------
//---- Class ELL1MAG --------------------
//------------------------------------
ClassName = 'ell1mag';
-======= +=======
//------------------------------------
//---- Class PRIMES --------------------
//------------------------------------
ClassName = 'PRIMES';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(3).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
@@ -11810,7 +12228,7 @@ PrintStringInfo('d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'ell1mag';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11825,28 +12243,28 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'primes';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD +<<<<<<< HEAD
//---- Class AMELL --------------------
//------------------------------------
ClassName = 'amell';
-======= +=======
//---- Class FACTOR --------------------
//------------------------------------
ClassName = 'FACTOR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD +<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11859,7 +12277,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'amell';
-======= +=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11874,19 +12292,19 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD +<<<<<<< HEAD
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ////////////////////////////////////////////
// /////PARTE INTRODOTTA DA ALBERTO MOREA
// /////////////////////////////////////////////
diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib Binary files differdeleted file mode 100644 index 113aba04..00000000 --- a/2.3-1/macros/ToolInitialization/lib +++ /dev/null diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci index 631dc691..90dad3ba 100644 --- a/2.3-1/macros/cb_sci2c_gui.sci +++ b/2.3-1/macros/cb_sci2c_gui.sci @@ -203,23 +203,12 @@ elseif get(gcbo, "tag")=="convertbtn" then // -*- DEBUG ONLY -*- -<<<<<<< HEAD - //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths); //mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir); //mprintf("RunMode = {%s}\n", RunMode); //mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode)); - //mprintf("NativeBuild = {%s}\n", NativeBuild); -======= - -// mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); -// mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths); -// mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir); -// mprintf("RunMode = {%s}\n", RunMode); -// mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode)); -// mprintf("NativeBuild = {%s}\n", NativeBuild); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //mprintf("NativeBuild = {%s}\n", NativeBuild); scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name); // // --- sci2c help --- diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index ba26703a..8e33e486 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -60,11 +60,10 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/logm.h" "src/c/matrixOperations/includes/ones.h" "src/c/matrixOperations/includes/matrixSquaredMagnitude.h" -<<<<<<< HEAD "src/c/linearAlgebra/includes/spec.h" -======= + "src/c/matrixOperations/includes/spec.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + "src/c/matrixOperations/includes/matrixTranspose.h" "src/c/matrixOperations/includes/determ.h" "src/c/matrixOperations/includes/matrixMultiplication.h" @@ -76,13 +75,11 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/kron.h" "src/c/matrixOperations/includes/flipdim.h" "src/c/matrixOperations/includes/norm.h" -<<<<<<< HEAD + "src/c/matrixOperations/includes/toeplitz.h" "src/c/interpolation/includes/interp1.h" "src/c/elementaryFunctions/includes/nextpow2.h" "src/c/elementaryFunctions/includes/gcd.h" "src/c/elementaryFunctions/includes/isreal.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/includes/cos.h" "src/c/elementaryFunctions/includes/fix.h" "src/c/elementaryFunctions/includes/exp.h" @@ -122,11 +119,8 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/int8.h" "src/c/elementaryFunctions/includes/uint16.h" "src/c/elementaryFunctions/includes/int16.h" -<<<<<<< HEAD "src/c/elementaryFunctions/includes/uint32.h" "src/c/elementaryFunctions/includes/int32.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/includes/acosd.h" "src/c/elementaryFunctions/includes/acot.h" "src/c/elementaryFunctions/includes/acotd.h" @@ -156,12 +150,9 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/string/includes/dynlib_string.h" "src/c/string/includes/disp.h" "src/c/string/includes/str.h" -<<<<<<< HEAD "src/c/signalProcessing/includes/modk.h" "src/c/signalProcessing/includes/idct.h" "src/c/signalProcessing/includes/dct.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/signalProcessing/fft/fft_internal.h" "src/c/signalProcessing/ifft/ifft_internal.h" "src/c/signalProcessing/levin/levinUtils.h" @@ -176,7 +167,6 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/signalProcessing/includes/lpc2cep.h" "src/c/signalProcessing/includes/dynlib_signalprocessing.h" "src/c/signalProcessing/includes/crossCorr.h" -<<<<<<< HEAD "src/c/signalProcessing/includes/zpbutt.h" "src/c/signalProcessing/includes/zpch1.h" "src/c/signalProcessing/includes/zpch2.h" @@ -191,8 +181,6 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/signalProcessing/includes/modsn.h" "src/c/signalProcessing/includes/ell1mag.h" "src/c/signalProcessing/includes/amell.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/implicitList/dynlib_implicitlist.h" "src/c/implicitList/implicitList.h" "src/c/differential_calculus/includes/ode.h" @@ -203,14 +191,11 @@ function allHeaders = getAllHeaders(SharedInfo) //"src/c/string/includes/strcmp.h" "src/c/string/includes/strrev.h" "src/c/string/includes/strrchr.h" -<<<<<<< HEAD "src/c/string/includes/strchr.h" "src/c/string/includes/ascii.h" "src/c/string/includes/strspn.h" "src/c/string/includes/strcspn.h" "src/c/string/includes/strncpy.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/includes/dec2bin.h" "src/c/elementaryFunctions/includes/dec2hex.h" "src/c/elementaryFunctions/includes/dec2oct.h" @@ -232,32 +217,27 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/factorial.h" "src/c/elementaryFunctions/includes/primes.h" "src/c/elementaryFunctions/includes/factor.h" -<<<<<<< HEAD "src/c/elementaryFunctions/includes/gcd.h" "src/c/elementaryFunctions/includes/lcm.h" "src/c/elementaryFunctions/includes/sinc.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/CACSD/includes/syslin.h" "src/c/CACSD/includes/lqr.h" "src/c/CACSD/includes/lqe.h" "src/c/CACSD/includes/obscont.h" -<<<<<<< HEAD - "src/c/linearAlgebra/includes/sva.h" - "src/c/linearAlgebra/includes/svd.h" "src/c/linearAlgebra/includes/schur.h" "src/c/linearAlgebra/includes/balanc.h" "src/c/linearAlgebra/includes/svd.h" - "src/c/linearAlgebra/includes/hess.h" - "src/c/linearAlgebra/includes/sva.h" - "src/c/linearAlgebra/includes/rcond.h"]; + "src/c/linearAlgebra/includes/hess.h" + "src/c/linearAlgebra/includes/sva.h" + "src/c/linearAlgebra/includes/sqroot.h" + "src/c/linearAlgebra/includes/givens.h" + "src/c/linearAlgebra/includes/householder.h" + "src/c/linearAlgebra/includes/fullrf.h" + "src/c/linearAlgebra/includes/rowcomp.h" + "src/c/linearAlgebra/includes/rcond.h" + "src/c/linearAlgebra/includes/qr.h" + "src/c/linearAlgebra/includes/spec.h"]; -======= - "src/c/linearAlgebra/includes/schur.h" - "src/c/linearAlgebra/includes/balanc.h" - "src/c/linearAlgebra/includes/rcond.h"]; - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Header files required for "Arduino" output Arduino_headers = [ @@ -287,7 +267,6 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/hardware/avr/includes/AVRUtil.h" "src/c/hardware/avr/includes/AVRPeripheralTimer.h" "src/c/hardware/avr/includes/AVRPeripheralUART.h" -<<<<<<< HEAD ]; RPi_headers = [ @@ -329,20 +308,6 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/hardware/rasberrypi/includes/RPIPeripheralSoft.h" "src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h" ]; -======= - ]; - - RPi_headers = [ - "thirdparty/includes/WiringPi/wiringPi.h" - "thirdparty/includes/WiringPi/wiringSerial.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h" - "src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h" - ]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 OpenCV_headers = [ "src/c/imageProcessing/includes/cvcore.hpp" @@ -364,12 +329,9 @@ function allHeaders = getAllHeaders(SharedInfo) allHeaders = cat(1,allHeaders,OpenCV_headers); end -<<<<<<< HEAD if(size(SharedInfo.Includelist) <> 0 & (mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) disp("Hi") allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL"); end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 4f5a77ab..4c8475ac 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -32,11 +32,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/type/int_real.h" "src/c/matrixOperations/interfaces/int_vmagn.h" "src/c/matrixOperations/interfaces/int_ones.h" -<<<<<<< HEAD - "src/c/linearAlgebra/interfaces/int_spec.h" -======= - "src/c/matrixOperations/interfaces/int_spec.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/matrixOperations/interfaces/int_cat.h" "src/c/matrixOperations/interfaces/int_zeros.h" "src/c/matrixOperations/interfaces/int_OpBackSlash.h" @@ -65,13 +60,11 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/matrixOperations/interfaces/int_flipdim.h" "src/c/matrixOperations/interfaces/int_permute.h" "src/c/matrixOperations/interfaces/int_norm.h" -<<<<<<< HEAD + "src/c/matrixOperations/interfaces/int_toeplitz.h" "src/c/interpolation/interfaces/int_interp1.h" "src/c/elementaryFunctions/interfaces/int_nextpow2.h" "src/c/elementaryFunctions/interfaces/int_gcd.h" "src/c/elementaryFunctions/interfaces/int_isreal.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/interfaces/int_asinh.h" "src/c/elementaryFunctions/interfaces/int_atanh.h" "src/c/elementaryFunctions/interfaces/int_sinh.h" @@ -101,29 +94,18 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_bitand.h" "src/c/elementaryFunctions/interfaces/int_bitor.h" "src/c/elementaryFunctions/interfaces/int_bitxor.h" -<<<<<<< HEAD "src/c/elementaryFunctions/interfaces/int_bitcmp.h" "src/c/elementaryFunctions/interfaces/int_bitset.h" "src/c/elementaryFunctions/interfaces/int_bitget.h" "src/c/elementaryFunctions/interfaces/int_linspace.h" "src/c/elementaryFunctions/interfaces/int_logspace.h" -======= - "src/c/elementaryFunctions/interfaces/int_bitcmp.h" - "src/c/elementaryFunctions/interfaces/int_bitset.h" - "src/c/elementaryFunctions/interfaces/int_bitget.h" - "src/c/elementaryFunctions/interfaces/int_linspace.h" - "src/c/elementaryFunctions/interfaces/int_logspace.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/interfaces/int_cosh.h" "src/c/elementaryFunctions/interfaces/int_uint8.h" "src/c/elementaryFunctions/interfaces/int_int8.h" "src/c/elementaryFunctions/interfaces/int_uint16.h" "src/c/elementaryFunctions/interfaces/int_int16.h" -<<<<<<< HEAD "src/c/elementaryFunctions/interfaces/int_uint32.h" "src/c/elementaryFunctions/interfaces/int_int32.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/interfaces/int_acosd.h" "src/c/elementaryFunctions/interfaces/int_acot.h" "src/c/elementaryFunctions/interfaces/int_acotd.h" @@ -136,11 +118,8 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_asech.h" "src/c/elementaryFunctions/interfaces/int_asind.h" "src/c/elementaryFunctions/interfaces/int_atand.h" -<<<<<<< HEAD "src/c/elementaryFunctions/interfaces/int_gcd.h" "src/c/elementaryFunctions/interfaces/int_lcm.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/statisticsFunctions/interfaces/int_mean.h" "src/c/statisticsFunctions/interfaces/int_meanf.h" "src/c/statisticsFunctions/interfaces/int_stdevf.h" @@ -169,12 +148,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/operations/interfaces/int_OpIns.h" "src/c/string/interfaces/int_disp.h" "src/c/string/interfaces/int_string.h" -<<<<<<< HEAD "src/c/signalProcessing/interfaces/int_modk.h" "src/c/signalProcessing/interfaces/int_idct.h" "src/c/signalProcessing/interfaces/int_dct.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/signalProcessing/interfaces/int_ifft.h" "src/c/signalProcessing/interfaces/int_lpc2cep.h" "src/c/signalProcessing/interfaces/int_cepstrum.h" @@ -185,7 +161,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/signalProcessing/interfaces/int_fftshift.h" "src/c/signalProcessing/interfaces/int_fft.h" "src/c/signalProcessing/interfaces/int_lev.h" -<<<<<<< HEAD "src/c/signalProcessing/interfaces/int_zpbutt.h" "src/c/signalProcessing/interfaces/int_zpch1.h" "src/c/signalProcessing/interfaces/int_zpch2.h" @@ -200,8 +175,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/signalProcessing/interfaces/int_modsn.h" "src/c/signalProcessing/interfaces/int_ell1mag.h" "src/c/signalProcessing/interfaces/int_amell.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/implicitList/int_OpColon.h" "src/c/differential_calculus/interfaces/int_ode.h" "src/c/differential_calculus/interfaces/int_diffc.h" @@ -211,14 +184,11 @@ function allInterfaces = getAllInterfaces(SharedInfo) //"src/c/string/interfaces/int_strcmp.h" "src/c/string/interfaces/int_strrev.h" "src/c/string/interfaces/int_strrchr.h" -<<<<<<< HEAD "src/c/string/interfaces/int_strchr.h" "src/c/string/interfaces/int_ascii.h" "src/c/string/interfaces/int_strspn.h" "src/c/string/interfaces/int_strcspn.h" "src/c/string/interfaces/int_strncpy.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/interfaces/int_dec2base.h" "src/c/elementaryFunctions/interfaces/int_base2dec.h" "src/c/elementaryFunctions/interfaces/int_dec2bin.h" @@ -240,26 +210,23 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_factorial.h" "src/c/elementaryFunctions/interfaces/int_primes.h" "src/c/elementaryFunctions/interfaces/int_factor.h" -<<<<<<< HEAD "src/c/elementaryFunctions/interfaces/int_sinc.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/CACSD/interfaces/int_syslin.h" "src/c/CACSD/interfaces/int_lqr.h" "src/c/CACSD/interfaces/int_lqe.h" "src/c/CACSD/interfaces/int_obscont.h" -<<<<<<< HEAD - "src/c/linearAlgebra/interfaces/int_sva.h" - "src/c/linearAlgebra/interfaces/int_svd.h" + "src/c/linearAlgebra/interfaces/int_spec.h" "src/c/linearAlgebra/interfaces/int_schur.h" "src/c/linearAlgebra/interfaces/int_balanc.h" "src/c/linearAlgebra/interfaces/int_svd.h" + "src/c/linearAlgebra/interfaces/int_sqroot.h" "src/c/linearAlgebra/interfaces/int_hess.h" - "src/c/linearAlgebra/interfaces/int_sva.h" -======= - "src/c/linearAlgebra/interfaces/int_schur.h" - "src/c/linearAlgebra/interfaces/int_balanc.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + "src/c/linearAlgebra/interfaces/int_sva.h" + "src/c/linearAlgebra/interfaces/int_givens.h" + "src/c/linearAlgebra/interfaces/int_householder.h" + "src/c/linearAlgebra/interfaces/int_fullrf.h" + "src/c/linearAlgebra/interfaces/int_rowcomp.h" + "src/c/linearAlgebra/interfaces/int_qr.h"; "src/c/linearAlgebra/interfaces/int_rcond.h"]; @@ -292,7 +259,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) RPI_interfaces = [ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h" -<<<<<<< HEAD "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h" "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h" "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralInterrupt.h" @@ -310,14 +276,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h" "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h" ]; -======= - "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h" - "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h" - "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h" - "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h" - "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h" - ]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 OpenCV_interfaces = [ "src/c/imageProcessing/interfaces/int_cvcore.hpp" diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index d29a1eea..f0f4e741 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -10,11 +10,7 @@ // // -<<<<<<< HEAD function allSources = getAllSources(SharedInfo) -======= -function allSources = getAllSources(SharedInfo,BuildTool) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Target = SharedInfo.Target; //Files common to types of output format @@ -99,13 +95,10 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/matrixOperations/cat/dcats.c" "src/c/matrixOperations/cat/scata.c" "src/c/matrixOperations/cat/scats.c" -<<<<<<< HEAD "src/c/matrixOperations/cat/zcata.c" "src/c/matrixOperations/cat/zcats.c" "src/c/matrixOperations/cat/ccata.c" "src/c/matrixOperations/cat/ccats.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/matrixOperations/cat/u8cats.c" "src/c/matrixOperations/cat/u8cata.c" "src/c/matrixOperations/cat/u16cats.c" @@ -162,32 +155,10 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/matrixOperations/powm/spowma.c" "src/c/matrixOperations/powm/zpowma.c" "src/c/matrixOperations/powm/cpowma.c" -<<<<<<< HEAD - "src/c/linearAlgebra/spec/cspeca.c" - "src/c/linearAlgebra/spec/dspeca.c" - "src/c/linearAlgebra/spec/sspeca.c" - "src/c/linearAlgebra/spec/zspeca.c" -======= - "src/c/matrixOperations/spec/cspeca.c" - "src/c/matrixOperations/spec/dspeca.c" - "src/c/matrixOperations/spec/sspeca.c" - "src/c/matrixOperations/spec/zspeca.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/matrixOperations/transpose/ztransposea.c" "src/c/matrixOperations/transpose/stransposea.c" "src/c/matrixOperations/transpose/ctransposea.c" "src/c/matrixOperations/transpose/dtransposea.c" -<<<<<<< HEAD - "src/c/linearAlgebra/spec2/zspec2a.c" - "src/c/linearAlgebra/spec2/sspec2a.c" - "src/c/linearAlgebra/spec2/dspec2a.c" - "src/c/linearAlgebra/spec2/cspec2a.c" -======= - "src/c/matrixOperations/spec2/zspec2a.c" - "src/c/matrixOperations/spec2/sspec2a.c" - "src/c/matrixOperations/spec2/dspec2a.c" - "src/c/matrixOperations/spec2/cspec2a.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/matrixOperations/trace/stracea.c" "src/c/matrixOperations/trace/dtracea.c" "src/c/matrixOperations/trace/ctracea.c" @@ -355,12 +326,18 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/matrixOperations/kron/skrona.c" "src/c/matrixOperations/norm/dnormv.c" "src/c/matrixOperations/norm/dnorma.c" -<<<<<<< HEAD + "src/c/matrixOperations/toeplitz/dtoeplitza.c" + "src/c/matrixOperations/toeplitz/u8toeplitza.c" + "src/c/matrixOperations/toeplitz/u16toeplitza.c" + "src/c/matrixOperations/toeplitz/gtoeplitza.c" + "src/c/matrixOperations/toeplitz/ztoeplitza.c" + "src/c/matrixOperations/toeplitz/stoeplitza.c" + "src/c/matrixOperations/toeplitz/ctoeplitza.c" + "src/c/matrixOperations/toeplitz/i8toeplitza.c" + "src/c/matrixOperations/toeplitz/i16toeplitza.c" "src/c/elementaryFunctions/nextpow2/dnextpow2a.c" "src/c/elementaryFunctions/isreal/sisreals.c" "src/c/elementaryFunctions/isreal/disreals.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/cos/dcosa.c" "src/c/elementaryFunctions/cos/dcoss.c" "src/c/elementaryFunctions/cos/scosa.c" @@ -647,11 +624,10 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/round/i16rounds.c" "src/c/elementaryFunctions/lnp1m1/slnp1m1s.c" "src/c/elementaryFunctions/lnp1m1/dlnp1m1s.c" -<<<<<<< HEAD - "src/c/elementaryFunctions/float/dfloats.c" + "src/c/elementaryFunctions/float/dfloats.c" "src/c/elementaryFunctions/float/dfloata.c" - "src/c/elementaryFunctions/float/sfloats.c" + "src/c/elementaryFunctions/float/sfloats.c" "src/c/elementaryFunctions/float/sfloata.c" "src/c/elementaryFunctions/float/u8floats.c" "src/c/elementaryFunctions/float/u8floata.c" @@ -662,8 +638,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/float/i16floats.c" "src/c/elementaryFunctions/float/i16floata.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/uint8/duint8s.c" "src/c/elementaryFunctions/uint8/duint8a.c" "src/c/elementaryFunctions/uint8/suint8s.c" @@ -674,21 +648,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/uint8/u16uint8a.c" "src/c/elementaryFunctions/uint8/i16uint8s.c" "src/c/elementaryFunctions/uint8/i16uint8a.c" -<<<<<<< HEAD -======= - "src/c/elementaryFunctions/float/dfloats.c" - "src/c/elementaryFunctions/float/dfloata.c" - "src/c/elementaryFunctions/float/sfloats.c" - "src/c/elementaryFunctions/float/sfloata.c" - "src/c/elementaryFunctions/float/u8floats.c" - "src/c/elementaryFunctions/float/u8floata.c" - "src/c/elementaryFunctions/float/i8floats.c" - "src/c/elementaryFunctions/float/i8floata.c" - "src/c/elementaryFunctions/float/u16floats.c" - "src/c/elementaryFunctions/float/u16floata.c" - "src/c/elementaryFunctions/float/i16floats.c" - "src/c/elementaryFunctions/float/i16floata.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/int8/dint8s.c" "src/c/elementaryFunctions/int8/dint8a.c" "src/c/elementaryFunctions/int8/sint8s.c" @@ -719,7 +678,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/int16/i8int16a.c" "src/c/elementaryFunctions/int16/u16int16s.c" "src/c/elementaryFunctions/int16/u16int16a.c" -<<<<<<< HEAD "src/c/elementaryFunctions/uint32/duint32s.c" "src/c/elementaryFunctions/uint32/duint32a.c" "src/c/elementaryFunctions/uint32/suint32s.c" @@ -749,8 +707,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/int32/u32int32s.c" "src/c/elementaryFunctions/int32/u32int32a.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/bitand/u8bitands.c" "src/c/elementaryFunctions/bitand/u8bitanda.c" "src/c/elementaryFunctions/bitand/u16bitands.c" @@ -771,11 +727,8 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/bitset/u16bitsets.c" "src/c/elementaryFunctions/bitget/u8bitgets.c" "src/c/elementaryFunctions/bitget/u16bitgets.c" -<<<<<<< HEAD "src/c/elementaryFunctions/linspace/slinspacea.c" "src/c/elementaryFunctions/linspace/slinspaces.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/linspace/dlinspaces.c" "src/c/elementaryFunctions/linspace/dlinspacea.c" "src/c/elementaryFunctions/logspace/dlogspaces.c" @@ -840,11 +793,8 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/atand/datands.c" "src/c/elementaryFunctions/atand/satanda.c" "src/c/elementaryFunctions/atand/satands.c" -<<<<<<< HEAD "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c" "src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/statisticsFunctions/max/dmaxa.c" "src/c/statisticsFunctions/max/smaxa.c" "src/c/statisticsFunctions/max/srowmaxa.c" @@ -1050,7 +1000,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/string/string/u16strings.c" "src/c/string/string/i16stringa.c" "src/c/string/string/i16strings.c" -<<<<<<< HEAD "src/c/signalProcessing/modk/dmodka.c" "src/c/signalProcessing/transforms/idct/sidcta.c" "src/c/signalProcessing/transforms/idct/cidcta.c" @@ -1060,8 +1009,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/signalProcessing/transforms/dct/cdcta.c" "src/c/signalProcessing/transforms/dct/zdcta.c" "src/c/signalProcessing/transforms/dct/ddcta.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/signalProcessing/fft/dfft2.c" "src/c/signalProcessing/fft/cfftma.c" "src/c/signalProcessing/fft/r2tx.c" @@ -1127,7 +1074,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/signalProcessing/hilbert/shilberts.c" "src/c/signalProcessing/hilbert/dhilberta.c" "src/c/signalProcessing/hilbert/dhilberts.c" -<<<<<<< HEAD "src/c/signalProcessing/zpbutt/dzpbutts.c" "src/c/signalProcessing/zpch1/dzpch1s.c" "src/c/signalProcessing/zpch2/dzpch2s.c" @@ -1148,8 +1094,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/signalProcessing/ell1mag/dell1maga.c" "src/c/signalProcessing/amell/damells.c" "src/c/signalProcessing/amell/damella.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/implicitList/zimplicitLists.c" "src/c/implicitList/dimplicitLists.c" "src/c/implicitList/cimplicitLists.c" @@ -1174,7 +1118,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/Files/mput/u16mputa.c" "src/c/Files/mput/i16mputa.c" "src/c/string/convstr/gconvstrs.c" -<<<<<<< HEAD "src/c/string/strsubst/gstrsubsta.c" //"src/c/string/strcmp/gstrcmps.c" "src/c/string/strrev/gstrreva.c" @@ -1185,12 +1128,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/string/strspn/gstrspna.c" "src/c/string/strcspn/gstrcspna.c" "src/c/string/strncpy/gstrncpya.c" -======= - "src/c/string/strsubst/gstrsubsta.c" - //"src/c/string/strcmp/gstrcmps.c" - "src/c/string/strrev/gstrreva.c" - "src/c/string/strrchr/gstrrchra.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c" "src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c" "src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c" @@ -1309,15 +1246,12 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/Trigonometry/sech/zsechs.c" "src/c/elementaryFunctions/Trigonometry/sech/csecha.c" "src/c/elementaryFunctions/Trigonometry/sech/csechs.c" -<<<<<<< HEAD "src/c/interpolation/interp1/sinterp13a.c" "src/c/interpolation/interp1/dinterp13a.c" "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c" "src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c" "src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c" "src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactorials.c" "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactoriala.c" "src/c/elementaryFunctions/discrete_mathematics/factorial/sfactorials.c" @@ -1330,22 +1264,28 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/CACSD/lqr/dlqra.c" "src/c/CACSD/lqe/dlqea.c" "src/c/CACSD/obscont/dobsconta.c" -<<<<<<< HEAD - "src/c/linearAlgebra/sva/dsvaa.c" - "src/c/linearAlgebra/svd/dsvda.c" + "src/c/linearAlgebra/spec2/zspec2a.c" + "src/c/linearAlgebra/spec2/sspec2a.c" + "src/c/linearAlgebra/spec2/dspec2a.c" + "src/c/linearAlgebra/spec2/cspec2a.c" + "src/c/linearAlgebra/spec/cspeca.c" + "src/c/linearAlgebra/spec/dspeca.c" + "src/c/linearAlgebra/spec/sspeca.c" + "src/c/linearAlgebra/spec/zspeca.c" "src/c/linearAlgebra/schur/dschura.c" "src/c/linearAlgebra/schur/dgschura.c" "src/c/linearAlgebra/balanc/dbalanca.c" "src/c/linearAlgebra/svd/dsvda.c" "src/c/linearAlgebra/svd/zsvda.c" + "src/c/linearAlgebra/sqroot/dsqroota.c" "src/c/linearAlgebra/hess/dhessa.c" + "src/c/linearAlgebra/givens/dgivensa.c" + "src/c/linearAlgebra/householder/dhouseholdera.c" "src/c/linearAlgebra/sva/dsvaa.c" "src/c/linearAlgebra/spec/dspec1a.c" -======= - "src/c/linearAlgebra/schur/dschura.c" - "src/c/linearAlgebra/schur/dgschura.c" - "src/c/linearAlgebra/balanc/dbalanca.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + "src/c/linearAlgebra/fullrf/dfullrfa.c" + "src/c/linearAlgebra/rowcomp/drowcompa.c" + "src/c/linearAlgebra/qr/dqra.c" "src/c/linearAlgebra/rcond/drconda.c"]; //Files to be inserted only if output format selected is 'Arduino'. @@ -1404,7 +1344,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) ]; RPI_files = [ -<<<<<<< HEAD "/src/c/hardware/rasberrypi/Digital/RPI_digitalReadByte.c" "/src/c/hardware/rasberrypi/Digital/u8RPI_digitalReads.c" "/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWriteBytes.c" @@ -1492,40 +1431,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) "/src/c/hardware/rasberrypi/Timing/RPI_millis.c" "/src/c/hardware/rasberrypi/Timing/u32RPI_delayMicros.c" "/src/c/hardware/rasberrypi/Timing/u32RPI_delays.c" -======= - "src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c" - "src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c" - "src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c" - "src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c" - "src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c" - "src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c" - "src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c" - "src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c" - "src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c" - "src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c" - "src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c" - "src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c" - "src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c" - "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c" - "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c" - "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c" - "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c" - "src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ]; OpenCV_files = [ @@ -1543,12 +1448,12 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/imageProcessing/cvimgproc/imcvCanny.cpp" "src/c/imageProcessing/cvimgproc/imcvCornerHarris.cpp"]; -<<<<<<< HEAD + if Target == "StandAlone" allSources = Standalone_files; elseif Target == "Arduino" allSources = cat(1,Standalone_files, Arduino_files); -======= + if Target == "Arduino" & BuildTool == "nmake" Required_addrs = get_rquird_fnctns(Standalone_files,Arduino_files,SharedInfo); end @@ -1561,7 +1466,6 @@ function allSources = getAllSources(SharedInfo,BuildTool) else allSources = cat(1,Standalone_files, Arduino_files); end ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 elseif Target == "AVR" allSources = cat(1,Standalone_files, AVR_files); elseif Target == "RPi" @@ -1572,12 +1476,5 @@ function allSources = getAllSources(SharedInfo,BuildTool) allSources = cat(1,allSources,OpenCV_files); end -<<<<<<< HEAD -======= - //"src/c/matrixOperations/cat/zcata.c" - // "src/c/matrixOperations/cat/zcats.c" - // "src/c/matrixOperations/cat/ccata.c" - //"src/c/matrixOperations/cat/ccats.c" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib Binary files differdeleted file mode 100644 index 4157ab8f..00000000 --- a/2.3-1/macros/findDeps/lib +++ /dev/null diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib Binary files differdeleted file mode 100644 index 3c96eeb4..00000000 --- a/2.3-1/macros/lib +++ /dev/null diff --git a/2.3-1/macros/sci2c_gui.sci b/2.3-1/macros/sci2c_gui.sci index bee6fe43..cad8b247 100644 --- a/2.3-1/macros/sci2c_gui.sci +++ b/2.3-1/macros/sci2c_gui.sci @@ -216,7 +216,7 @@ outformatlabel = uicontrol("parent", sci2cfig,... outformatradiostalone = uicontrol("parent", sci2cfig,... "style", "radiobutton",... "string", gettext("Stand-alone"),... - "position",[2*margin+widgetLabelWidth outformaty 2*radiow widgeth],... + "position",[2*margin+widgetLabelWidth outformaty 2*radiow-10 widgeth],... "horizontalalignment", "left",... "fontname", defaultfont,... "fontunits", "points",... @@ -309,7 +309,7 @@ runradiotranslate = uicontrol("parent", sci2cfig,... runradiogenlib = uicontrol("parent", sci2cfig,... "style", "radiobutton",... "string", gettext("Generate library"),... - "position",[2*margin+widgetLabelWidth+2*radiow runy 120 widgeth],... + "position",[2*margin+widgetLabelWidth+2*radiow+20 runy 150 widgeth],... "horizontalalignment", "left",... "fontname", defaultfont,... "fontunits", "points",... diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index f78c359e..aff3df69 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -60,7 +60,7 @@ function scilab2c(varargin) RunMode = "All"; BuildTool = getNativeBuildTool(); Target = "StandAlone" - //Board_name = "uno" + Board_name = "uno" // // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode) // diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h index d5714884..6b7ed271 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h @@ -5,11 +5,7 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Siddhesh Wani, Jorawar Singh -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -24,7 +20,6 @@ extern "C" { #endif -<<<<<<< HEAD #define u80RPI_digitalReadu80(pin) u8RPI_digitalReads(pin); #define d0RPI_digitalReadd0(pin) u8RPI_digitalReads(pin); @@ -33,20 +28,10 @@ extern "C" { #define d0d0RPI_digitalWrite(pin,state) u8RPI_digitalWrites(pin,state); #define u80RPI_digitalWriteByte(value) u8RPI_digitalWriteBytes(value); -======= -#define RPI_DigitalSetup(in1,in2) u8RPIDigitalSetups((uint8) in1, (uint8) in2); - -#define RPI_DigitalIn(in1) u8RPIDigitalIns((uint8) in1); - -#define RPI_DigitalOut(in1,in2) u8RPIDigitalOuts((uint8) in1, (uint8) in2); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +#define d0RPI_digitalWriteByte(value) u8RPI_digitalWriteBytes(value); #ifdef __cplusplus } /* extern "C" */ #endif -<<<<<<< HEAD #endif /* !__INT_RPIPERIPHERALGPIO_H__ */ -======= -#endif /* !__RPIPERIPHERALGPIO_H__ */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h index cea8bb6e..e258068c 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h @@ -21,9 +21,15 @@ extern "C" { #endif #define RPI_gertboardSPISetupi80() RPI_gertboardSPISetup(); + #define u160RPI_gertboardAnalogSetupi80(pinBase) u16RPI_gertboardAnalogSetups(pinBase); +#define d0RPI_gertboardAnalogSetupi80(pinBase) u16RPI_gertboardAnalogSetups(pinBase); + #define u160RPI_gertboardAnalogReadu160(pin) u160RPI_gertboardAnalogReads(pin); +#define d0RPI_gertboardAnalogReadu160(pin) u160RPI_gertboardAnalogReads(pin); + #define u160u160RPI_gertboardAnalogWrite(pin,value) u160RPI_gertboardAnalogWrites(pin,value); +#define d0d0RPI_gertboardAnalogWrite(pin,value) u160RPI_gertboardAnalogWrites(pin,value); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h index f18fd57c..b93529e3 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h @@ -21,12 +21,25 @@ extern "C" { #endif #define u160RPI_I2CSetupi80(arrd) u16RPI_I2CSetups(arrd); +#define d0RPI_I2CSetupi80(arrd) u16RPI_I2CSetups(arrd); + #define u160RPI_I2CReadi80(fd) u16RPI_I2CReads(fd); +#define d0RPI_I2CReadi80(fd) u16RPI_I2CReads(fd); + #define u160u160RPI_I2CReadReg8i80(fd,reg) u16RPI_I2CReadReg8s(fd,reg); +#define d0d0RPI_I2CReadReg8i80(fd,reg) u16RPI_I2CReadReg8s(fd,reg); + #define u160u160RPI_I2CReadReg16i80(fd,reg) u16RPI_I2CReadReg16s(fd,reg); +#define d0d0RPI_I2CReadReg16i80(fd,reg) u16RPI_I2CReadReg16s(fd,reg); + #define u160u160RPI_I2CWritei80(fd,data) u16RPI_I2CWrites(fd,data); +#define d0d0RPI_I2CWritei80(fd,data) u16RPI_I2CWrites(fd,data); + #define u160u160u160RPI_I2CWriteReg8i80(fd,reg,data) u16RPI_I2CWriteReg8s(fd,reg,data); +#define d0d0d0RPI_I2CWriteReg8i80(fd,reg,data) u16RPI_I2CWriteReg8s(fd,reg,data); + #define u160u160u160RPI_I2CWriteReg16i80(fd,reg,data) u16RPI_I2CWriteReg16s(fd,reg,data); +#define d0d0d0RPI_I2CWriteReg16i80(fd,reg,data) u16RPI_I2CWriteReg16s(fd,reg,data); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h index e4f3ca29..e6dcb7db 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h @@ -21,17 +21,40 @@ extern "C" { #endif #define u80u80u80u80u80u80u80u80u80u80RPI_lcdCharDef(fd,index,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdCharDefs(fd,index,d0,d1,d2,d3,d4,d5,d6,d7); +#define d0d0d0d0d0d0d0d0d0d0RPI_lcdCharDef(fd,index,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdCharDefs(fd,index,d0,d1,d2,d3,d4,d5,d6,d7); + #define u80RPI_lcdClear(fd) u8RPI_lcdClears(fd); +#define d0RPI_lcdClear(fd) u8RPI_lcdClears(fd); + #define u80u80RPI_lcdCursorBlink(fd,state) u8RPI_lcdCursorBlinks(fd,state); +#define d0d0RPI_lcdCursorBlink(fd,state) u8RPI_lcdCursorBlinks(fd,state); + #define u80u80RPI_lcdCursor(fd,state) u8RPI_lcdCursors(fd,state); +#define d0d0RPI_lcdCursor(fd,state) u8RPI_lcdCursors(fd,state); + #define u80u80RPI_lcdDisplay(fd,state) u8RPI_lcdDisplays(fd,state); +#define d0d0RPI_lcdDisplay(fd,state) u8RPI_lcdDisplays(fd,state); + #define u80RPI_lcdHome(fd) u8RPI_lcdHomes(fd); +#define d0RPI_lcdHome(fd) u8RPI_lcdHomes(fd); + #define u80u80u80u80u80u80u80u80u80u80u80u80u80RPI_lcdIniti80(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdInits(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7); +#define d0d0d0d0d0d0d0d0d0d0d0d0d0RPI_lcdIniti80(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdInits(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7); + #define u80u80u80RPI_lcdPosition(fd,row,col) u8RPI_lcdPositions(fd,row,col); +#define d0d0d0RPI_lcdPosition(fd,row,col) u8RPI_lcdPositions(fd,row,col); + #define u80u80RPI_lcdPutchar(fd,char) u8RPI_lcdPutchars(fd,char); +#define d0d0RPI_lcdPutchar(fd,char) u8RPI_lcdPutchars(fd,char); + #define u80u80RPI_lcdSendCommand(fd,cmd) u8RPI_lcdSendCommands(fd,cmd); +#define d0d0RPI_lcdSendCommand(fd,cmd) u8RPI_lcdSendCommands(fd,cmd); + #define u80g2RPI_lcdPuts(fd,msg,size) u8RPI_lcdPutss(fd,msg,size[1]);; +#define d0g2RPI_lcdPuts(fd,msg,size) u8RPI_lcdPutss(fd,msg,size[1]);; + #define u80g2RPI_lcdPrintf(fd,data,size) u8RPI_lcdPrintfs(fd,data,size[1]); +#define d0g2RPI_lcdPrintf(fd,data,size) u8RPI_lcdPrintfs(fd,data,size[1]); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h index 46b63286..77cc433c 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h @@ -38,8 +38,10 @@ extern "C" { #define u80u80u80u80u80RPI_lcd128x64line(x0,y0,x1,y1,colour) u8RPI_lcd128x64lines(x0,y0,x1,y1,colour); #define d0d0d0d0d0RPI_lcd128x64line(x0,y0,x1,y1,colour) u8RPI_lcd128x64lines(x0,y0,x1,y1,colour); + #define u80u80u80u80u80RPI_lcd128x64circle(x,y,r,colour,filled) u8RPI_lcd128x64circles(x,y,r,colour,filled); #define d0d0d0d0d0RPI_lcd128x64circle(x,y,r,colour,filled) u8RPI_lcd128x64circles(x,y,r,colour,filled); + #define u80u80u80u80u80RPI_lcd128x64putchar(x,y,c,bgCol,fgCol) u8RPI_lcd128x64putchars(x,y,c,bgCol,fgCol); #define d0d0d0d0u80RPI_lcd128x64putchar(x,y,c,bgCol,fgCol) u8RPI_lcd128x64putchars(x,y,c,bgCol,fgCol); @@ -48,6 +50,7 @@ extern "C" { #define u80u80u80u80u80u80RPI_lcd128x64rectangle(x1,y1,x2,y2,colour,filled) u8RPI_lcd128x64rectangles(x1,y1,x2,y2,colour,filled); #define d0d0d0d0d0d0RPI_lcd128x64rectangle(x1,y1,x2,y2,colour,filled) u8RPI_lcd128x64rectangles(x1,y1,x2,y2,colour,filled); + #define u80u80u80u80u80u80RPI_lcd128x64ellipse(cx,cy,xRadius,yRadius,colour,filled) u8RPI_lcd128x64ellipses(cx,cy,xRadius,yRadius,colour,filled); #define d0d0d0d0d0d0RPI_lcd128x64ellipse(cx,cy,xRadius,yRadius,colour,filled) u8RPI_lcd128x64ellipses(cx,cy,xRadius,yRadius,colour,filled); diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h index c044cf7f..7857b3ae 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h @@ -21,10 +21,19 @@ extern "C" { #endif #define u160u80RPI_mcp23008Setupu80(pinBase,addr) u16RPI_mcp23008Setups(pinBase,addr); +#define d0d0RPI_mcp23008Setupu80(pinBase,addr) u16RPI_mcp23008Setups(pinBase,addr); + #define u160u80RPI_mcp23016Setupu80(pinBase,addr) u16RPI_mcp23016Setups(pinBase,addr); +#define d0d0RPI_mcp23016Setupu80(pinBase,addr) u16RPI_mcp23016Setups(pinBase,addr); + #define u160u80RPI_mcp23017Setupu80(pinBase,addr) u16RPI_mcp23017Setups(pinBase,addr); +#define d0d0RPI_mcp23017Setupu80(pinBase,addr) u16RPI_mcp23017Setups(pinBase,addr); + #define u160u80u80RPI_mcp23s08Setupu80(pinBase,spiport,devId) u16RPI_mcp23s08Setups(pinBase,spiport,devId); +#define d0d0d0RPI_mcp23s08Setupu80(pinBase,spiport,devId) u16RPI_mcp23s08Setups(pinBase,spiport,devId); + #define u160u80u80RPI_mcp23s17Setupu80(pinBase,spiport,devId) u16RPI_mcp23s17Setups(pinBase,spiport,devId); +#define d0d0d0RPI_mcp23s17Setupu80(pinBase,spiport,devId) u16RPI_mcp23s17Setups(pinBase,spiport,devId); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h index b836d683..de065a24 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h @@ -21,8 +21,12 @@ extern "C" { #endif #define RPI_boardRevu80() RPI_boardRev(); + #define u80u80RPI_padDrive(group,strength) u8RPI_padDrives(group,strength); +#define d0d0RPI_padDrive(group,strength) u8RPI_padDrives(group,strength); + #define u160RPI_sn3218Setupi80(pinBase) u16RPI_sn3218Setups(pinBase); +#define d0RPI_sn3218Setupi80(pinBase) u16RPI_sn3218Setups(pinBase); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h index edf9aedc..fd1a1b08 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h @@ -1,58 +1,41 @@ -<<<<<<< HEAD /* Copyright (C) 2016 - IIT Bombay - FOSSEE -======= - /* Copyright (C) 2016 - IIT Bombay - FOSSEE ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 This file must be used under the terms of the CeCILL. This source file is licensed as described in the file COPYING, which you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Jorawar Singh, Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -======= - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_RPIPERIPHERALPWM_H__ #define __INT_RPIPERIPHERALPWM_H__ #include "types.h" -<<<<<<< HEAD #include "RPIPeripheralPWM.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus extern "C" { #endif -<<<<<<< HEAD #define u80u160RPI_pwmWrite(pin,value) u8RPI_pwmWrites(pin,value); +#define d0d0RPI_pwmWrite(pin,value) u8RPI_pwmWrites(pin,value); + #define u320RPI_pwmRange(value) u32RPI_pwmRanges(value); +#define d0RPI_pwmRange(value) u32RPI_pwmRanges(value); + #define g2RPI_pwmMode(mode) gRPI_pwmModea(mode); + #define u160RPI_pwmClock(divisor) u16RPI_pwmClocks(divisor); +#define d0RPI_pwmClock(divisor) u16RPI_pwmClocks(divisor); + #define u80u160RPI_pwmToneWrite(pin,value) u8RPI_pwmToneWrites(pin,value); -======= -#define RPI_HardPWMWrite(pin,value) u8RPIHardPWMWrites((uint8)pin,(uint16)value) -#define RPI_HardPWMSetRange(value) u8RPIHardPWMSetRanges((uint16)value) -#define RPI_HardPWMSetMode(mode) u8RPIHardPWMSetModes((uint8)mode) -#define RPI_HardPWMSetClock(clk_divisor) u8RPIHardPWMSetClocks((uint16)clk_divisor) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +#define d0d0RPI_pwmToneWrite(pin,value) u8RPI_pwmToneWrites(pin,value); #ifdef __cplusplus } /* extern "C" */ #endif -<<<<<<< HEAD #endif /* !__INT_RPIPERIPHERALPWM_H__ */ -======= -#endif /*__INT_RPIPERIPHERALPWM_H__*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h index e3d2009d..3d0cb273 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h @@ -21,7 +21,10 @@ extern "C" { #endif #define u160u80RPI_pcf8574Setupu80(pinBase,addr) u16RPI_pcf8574Setups(pinBase,addr); +#define d0d0RPI_pcf8574Setupu80(pinBase,addr) u16RPI_pcf8574Setups(pinBase,addr); + #define u160u80RPI_pcf8591Setupu80(pinBase,addr) u16RPI_pcf8591Setups(pinBase,addr); +#define d0d0RPI_pcf8591Setupu80(pinBase,addr) u16RPI_pcf8591Setups(pinBase,addr); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h index 08056f94..8e268f6e 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h @@ -21,9 +21,16 @@ extern "C" { #endif #define u80RPI_piGlowSetup(clear) u8RPI_piGlowSetups(clear); +#define d0RPI_piGlowSetup(clear) u8RPI_piGlowSetups(clear); + #define u80u80u80RPI_piGlow1(leg,ring,intensity) u8RPI_piGlow1s(leg,ring,intensity); +#define d0d0d0RPI_piGlow1(leg,ring,intensity) u8RPI_piGlow1s(leg,ring,intensity); + #define u80u80RPI_piGlowLeg(leg,intensity) u8RPI_piGlowLegs(leg,intensity); +#define d0d0RPI_piGlowLeg(leg,intensity) u8RPI_piGlowLegs(leg,intensity); + #define u80u80RPI_piGlowRing(ring,intensity) u8RPI_piGlowRings(ring,intensity); +#define d0d0RPI_piGlowRing(ring,intensity) u8RPI_piGlowRings(ring,intensity); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h index 39c5c011..8de0dc29 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h @@ -21,7 +21,10 @@ extern "C" { #endif #define u80RPI_physToGpioi80(pin) u8RPI_physToGpios(pin); +#define d0RPI_physToGpioi80(pin) u8RPI_physToGpios(pin); + #define u80RPI_wpiToGpioi80(pin) u8RPI_wpiToGpios(pin); +#define d0RPI_wpiToGpioi80(pin) u8RPI_wpiToGpios(pin); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h index 5924c906..b308d838 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h @@ -1,78 +1,51 @@ -<<<<<<< HEAD /* Copyright (C) 2016 - IIT Bombay - FOSSEE -======= - /* Copyright (C) 2016 - IIT Bombay - FOSSEE ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 This file must be used under the terms of the CeCILL. This source file is licensed as described in the file COPYING, which you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Jorawar Singh, Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -======= - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_RPIPERIPHERALSERIAL_H__ #define __INT_RPIPERIPHERALSERIAL_H__ #include "types.h" -<<<<<<< HEAD #include "RPIPeripheralSerial.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus extern "C" { #endif -<<<<<<< HEAD #define g2u320RPI_serialOpeni80(device,size,baud) gRPI_serialOpena(device,size[1],baud); +#define g2d0RPI_serialOpeni80(device,size,baud) gRPI_serialOpena(device,size[1],baud); + #define u80RPI_serialClose(fd) u8RPI_serialCloses(fd); +#define d0RPI_serialClose(fd) u8RPI_serialCloses(fd); + #define u80RPI_serialDataAvailu80(fd) u8RPI_serialDataAvails(fd); +#define d0RPI_serialDataAvailu80(fd) u8RPI_serialDataAvails(fd); + #define u80RPI_serialFlush(fd) u8RPI_serialFlushs(fd); +#define d0RPI_serialFlush(fd) u8RPI_serialFlushs(fd); + #define u80RPI_serialGetcharg2(fd,out) u8RPI_serialGetchars(fd,out); -#define u80g2RPI_serialPrintf(fd,msg,size) u8RPI_serialPrintfs(fd,msg,size[1]); -#define u80u80RPI_serialPutchar(fd,character) u8RPI_serialPutchars(fd,character); -#define u80g2RPI_serialPutsg2(fd,character,size) u8RPI_serialPutss(fd,character,size[1]); -======= -#define RPI_SerialSetup(port,size,baudrate) u16RPISerialSetups(port,baudrate) -#define RPI_SerialClose(fd) u8RPISerialCloses(fd) +#define d0RPI_serialGetcharg2(fd,out) u8RPI_serialGetchars(fd,out); -#define u80u80RPI_SerialSendData(fd,data) u8RPISerialSendDatas(fd,data) -#define u80i80RPI_SerialSendData(fd,data) i8RPISerialSendDatas(fd,data) -#define u80u160RPI_SerialSendData(fd,data) u16RPISerialSendDatas(fd,data) -#define u80i160RPI_SerialSendData(fd,data) i16RPISerialSendDatas(fd,data) -#define u80s0RPI_SerialSendData(fd,data) sRPISerialSendDatas(fd,data) -#define u80d0RPI_SerialSendData(fd,data) dRPISerialSendDatas(fd,data) +#define u80g2RPI_serialPrintf(fd,msg,size) u8RPI_serialPrintfs(fd,msg,size[1]); +#define d0g2RPI_serialPrintf(fd,msg,size) u8RPI_serialPrintfs(fd,msg,size[1]); -#define u80u82RPI_SerialSendData(fd,data,size) u8RPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80i82RPI_SerialSendData(fd,data,size) i8RPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80u162RPI_SerialSendData(fd,data,size) u16RPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80i162RPI_SerialSendData(fd,data,size) i16RPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80s2RPI_SerialSendData(fd,data,size) sRPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80d2RPI_SerialSendData(fd,data,size) dRPISerialSendDataa(fd,data,size[0]*size[1]); -#define u80g2RPI_SerialSendData(fd,data,size) gRPISerialSendDatas(fd,data,size[0]*size[1]); +#define u80u80RPI_serialPutchar(fd,character) u8RPI_serialPutchars(fd,character); +#define d0d0RPI_serialPutchar(fd,character) u8RPI_serialPutchars(fd,character); -#define RPI_SerialDataAvail(fd) i16RPISerialDataAvails(fd) -#define RPI_SerialGetChar(fd) i16RPISerialGetChars(fd) -#define RPI_SerialFlush(fd) u8RPISerialFlushs(fd) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +#define u80g2RPI_serialPutsg2(fd,character,size) u8RPI_serialPutss(fd,character,size[1]); +#define d0g2RPI_serialPutsg2(fd,character,size) u8RPI_serialPutss(fd,character,size[1]); #ifdef __cplusplus } /* extern "C" */ #endif -<<<<<<< HEAD #endif /* !__INT_RPIPERIPHERALSERIAL_H__ */ -======= -#endif /*__INT_RPIPERIPHERALSERIAL_H__*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h index bd82702d..6bcb1632 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h @@ -23,18 +23,12 @@ extern "C" { #define g2RPI_pinNumberingi80(seq,size) gRPI_pinNumberinga(seq,size[1]); //getAlt #define u80RPI_getAltu80(pin) u8RPI_getAlts(pin); -#define u160RPI_getAltu80(pin) u8RPI_getAlts(pin); -#define u320RPI_getAltu80(pin) u8RPI_getAlts(pin); #define d0RPI_getAltu80(pin) u8RPI_getAlts(pin); //pinModeAlt #define u80u80RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -#define u160u160RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -#define u320u320RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); #define d0d0RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); //pinMode #define u80g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -#define u160g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -#define u320g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); #define d0g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); //pullControl #define u80g2RPI_pullControl(pin,mode,size) u8RPI_pullControls(pin,mode,size[1]); diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h index 6b142bd5..7b70ce9a 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h @@ -21,8 +21,13 @@ extern "C" { #endif #define u80u80u80RPI_shiftInu80(dpin,cpin,order) u8RPI_shiftIns(dpin,cpin,order); +#define d0d0d0RPI_shiftInu80(dpin,cpin,order) u8RPI_shiftIns(dpin,cpin,order); + #define u80u80u80u80RPI_shiftOut(dpin,cpin,order,val) u8RPI_shiftOuts(dpin,cpin,order,val); +#define d0d0d0d0RPI_shiftOut(dpin,cpin,order,val) u8RPI_shiftOuts(dpin,cpin,order,val); + #define u160u80u80u80u80RPI_sr595Setupi80(pinBase,nPins,dP,cP,lP) u16RPI_sr595Setups(pinBase,nPins,dP,cP,lP); +#define d0d0d0d0d0RPI_sr595Setupi80(pinBase,nPins,dP,cP,lP) u16RPI_sr595Setups(pinBase,nPins,dP,cP,lP); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h index 80372b26..646c5244 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h @@ -21,11 +21,22 @@ extern "C" { #endif #define u80u160u160RPI_softPwmCreateu80(pin,ival,range) u8RPI_softPwmCreates(pin,ival,range); +#define d0d0d0RPI_softPwmCreateu80(pin,ival,range) u8RPI_softPwmCreates(pin,ival,range); + #define u80RPI_softPwmStop(pin) u8RPI_softPwmStops(pin); +#define d0RPI_softPwmStop(pin) u8RPI_softPwmStops(pin); + #define u80u160RPI_softPwmWrite(pin,value) u8RPI_softPwmWrites(pin,value); +#define d0d0RPI_softPwmWrite(pin,value) u8RPI_softPwmWrites(pin,value); + #define u80RPI_softToneCreateu80(pin) u8RPI_softToneCreates(pin); +#define d0RPI_softToneCreateu80(pin) u8RPI_softToneCreates(pin); + #define u80RPI_softToneStop(pin) u8RPI_softToneStops(pin); +#define d0RPI_softToneStop(pin) u8RPI_softToneStops(pin); + #define u80u320RPI_softToneWrite(pin,value) u8RPI_softToneWrites(pin,value); +#define d0d0RPI_softToneWrite(pin,value) u8RPI_softToneWrites(pin,value); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index 073cc1ec..c91fdfb2 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -33,6 +33,8 @@ extern "C" { #define d0RPI_delay(time) u32RPI_delays(time); #define u320RPI_delayMicro(time) u32RPI_delayMicros(time); +#define d0RPI_delayMicro(time) u32RPI_delayMicros(time); + #define RPI_millisu320() RPI_millis(); #define RPI_microsu320() RPI_micros(); ======= diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c index fe1b8cd2..3fe0c828 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c @@ -12,6 +12,6 @@ #include "RPIPeripheralPWM.h" -void u8RPI_pwmToneWrites(uint8 pin, uint16 value){ - pwmToneWrite(pin, value); +void u8RPI_pwmToneWrites(uint8 pin,uint16 freq){ + pwmToneWrite(pin,freq); } diff --git a/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.c b/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.c new file mode 100644 index 00000000..a409ae35 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.c @@ -0,0 +1,112 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* FULL Rank factorization function in scilab */ + +/* + //[Q,M,rk]=fullrf(A) + //Full rank factorization : A=Q.M + //with range(Q)=range(A) and ker(M)=ker(A), + //Q full column rank , M full row rank + // rk = rank(A) = #columns(Q) = #rows(M) + //F.D. +*/ + +#include "fullrf.h" +#include <stdio.h> +#include <stdlib.h> +#include "svd.h" +#include <math.h> +#include "norm.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" + +double dfullrfa(int ninp,double *inp1,int row,int col,double tol,double *out1,double *out2){ + + int i,j; + /* norm inp1 - norm(inp1,1)*/ + double na1; + na1 = dnorma(inp1,row,col,1); + + if(ninp == 1){ + tol = sqrt(pow(2,-52)); + } + + if(na1 < pow(1,-10)){ + out1 = NULL; + out2 = NULL; + return 0; + } + + double tol1; + tol1 = tol*na1; + + double *U,*S,*V; + U = (double *)malloc(row*row*sizeof(double)); + S = (double *)malloc(row*col*sizeof(double)); + V = (double *)malloc(col*col*sizeof(double)); + + double rk; + rk = dsvda(tol1,inp1,row,col,0,4,U,S,V); + + /* sq = sqrt(s) */ + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + if(i == j){ + S[i*row+j] = pow(S[i*row+j],0.5); + } + else{ + S[i*row+j] = 0; + } + } + } + + double *Q; + Q = (double *)malloc(row*col*sizeof(double)); + dmulma(U,row,row,S,row,col,Q); + + double *VT; + VT = (double *)malloc(col*col*sizeof(double)); + dtransposea(V,col,col,VT); + + /* multiplication of sq*V' or S*VT */ + double *M; + M = (double *)malloc(row*col*sizeof(double)); + dmulma(S,row,col,VT,col,col,M); + + /* This Program is not yet completed properly, as it outputs the whole matrix, instead of the exact output. + + if anyone finds, how to fix the size in INITFILLscidir.sci +please change there and change below few lines of codes accordingly. + +*/ + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + //if(j < rk) + out1[i*col+j] = Q[i*col+j]; + //else + // out1[i*col+j] = 0; + } + //printf("\n"); + } + + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + //if(i < rk) + out2[i*col+j] = M[i*col+j]; + //else + // out2[i*col+j] = 0; + } + } + + return rk; +} diff --git a/2.3-1/src/c/linearAlgebra/givens/dgivensa.c b/2.3-1/src/c/linearAlgebra/givens/dgivensa.c new file mode 100644 index 00000000..9bf0637b --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/givens/dgivensa.c @@ -0,0 +1,76 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* GIVENS scilab function + Syntax : u=givens(xy) + u=givens(x,y) + xy = [x;y], u=givens(xy) + returns a 2*2 matrix u such that u*xy=[r;0]. + c is equal to u*xy + givens(x,y)=givens([x;y]) +*/ + +#include "givens.h" +#include <stdio.h> +#include <math.h> +#include "norm.h" + +/* All variable names are according to scilab code */ + +void dgivensa(int ninp,double *inp1,int row,int col,double *inp2,int row1,int col1,int nout,double *out1,double *out2){ + double *x; + double r; + x = (double *)malloc((double)2*sizeof(double)); + if(ninp == 2){ + if(row != 1 || col != 1 || row1 != 1 || col1 != 1){ + printf("Wrong size for input argument: A column vector expected.\n"); + return; + } + *(x) = *(inp1); + *(x+1) = *(inp2); + } + else{ + //printf("(%d %d)",row,col); + if(row != 2 || col != 1){ + printf("Wrong size for input argument: A column vector expected.\n"); + return; + } + //printf("(%lf %lf)",inp1[0],inp1[1]); + x[0] = inp1[0]; + x[1] = inp1[1]; + } + if(*(x+1) != 0){ + //printf("(%lf %lf)",x[0],x[1]); + /*Norm of type 2 - find the maximum singular value*/ + r = dnorma(x,2,1,2); + //printf("%lf \n",r); + *(out1) = (*(x))/r; + *(out1+1) = -(*(x+1))/r; + *(out1+2) = (*(x+1))/r; + *(out1+3) = (*(x))/r; + if(nout == 2){ + *(out2) = r; + *(out2+1) = 0; + } + + } + else{ + *(out1) = 1; + *(out1+1) = 0; + *(out1+2) = 1; + *(out1+3) = 0; + if(nout == 2){ + *(out2) = *(x); + *(out2+1) = *(x+1); + } + } +} diff --git a/2.3-1/src/c/linearAlgebra/hess/dhessa.c b/2.3-1/src/c/linearAlgebra/hess/dhessa.c index 57f81b35..e1f2e2d1 100644 --- a/2.3-1/src/c/linearAlgebra/hess/dhessa.c +++ b/2.3-1/src/c/linearAlgebra/hess/dhessa.c @@ -20,11 +20,13 @@ #include "matrixTranspose.h" #include "matrixMultiplication.h" +/* Lapack subroutines - which are used*/ extern int dgehrd_(int *, int *,int *,double *,int *,double *,double *,int *,int *); extern int dorghr_(int *, int *,int *,double *,int *,double *,double *,int *,int *); - +/* All the vairbale names are given exactly the same name as scilab source code */ void dhessa(double *in1,int size,int nout,double *out1, double *out2){ +/* Variables names are done through, Lapack library. */ int i,j,k; int N = size; int ILO=1; @@ -41,11 +43,11 @@ void dhessa(double *in1,int size,int nout,double *out1, double *out2){ WORK = (double *)malloc((double)LWORK*sizeof(double)); dgehrd_(&N,&ILO,&IHI,A,&LDA,TAU,WORK,&N,&INFO); - for(i=0;i<N;i++) + for(i=0;i<N;i++) /* copying it in output */ for(j=0;j<N;j++) out2[i+j*N] = A[i+j*N]; - for(j=1;j<=N-2;j++){ + for(j=1;j<=N-2;j++){ /* copying it in output */ for(i=j+2;i<=N;i++){ out2[(i-1)+(j-1)*N] = 0; } diff --git a/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c b/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c new file mode 100644 index 00000000..5a98bfae --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c @@ -0,0 +1,90 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Householder orthogonal reflexion matrix */ + +/* +Syntax :- + //u=householder(v [,w]) + //Description + //given 2 column vectors v w of same size householder(v,w) returns a unitary + //column vector u, such that (eye-2*u*u')*v is proportional to w. + //(eye-2*u*u') is the orthogonal Householder reflexion matrix + // + // w default value is eye(v). In this case vector (eye-2*u*u')*v is the + // vector eye(v)*(+-norm(v)) +*/ +#include <stdio.h> +#include <stdlib.h> +#include "householder.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include <math.h> +#include "norm.h" + +void dhouseholdera(int ninp,double *inp1,int row,double *inp2,double *out1){ + + int i,j; + double *x; + x = (double *)malloc(row*sizeof(double)); + + for(i=0;i<row;i++) + x[i] = inp1[i]; + + if(ninp < 2){ + deyea(x,row,1); + } + else{ + for(i=0;i<row;i++){ + x[i] = inp2[i]; + } + } + + /* vt transpose of inp1 */ + + double *vt; + vt = (double *)malloc(row*sizeof(double)); + dtransposea(inp1,row,1,vt); + + /*wt transpose of inp2 */ + double *wt; + wt = (double *)malloc(row*sizeof(double)); + dtransposea(x,row,1,wt); + + /* vvt = inp1*vt */ + double *vvt; + vvt = (double *)malloc(1*1*sizeof(double)); + dmulma(vt,1,row,inp1,row,1,vvt); + + /* wwt = inp2*wt */ + double *wwt; + wwt = (double *)malloc(1*1*sizeof(double)); + dmulma(wt,1,row,x,row,1,wwt); + + /* a=-sqrt((v'*v)/(w'*w)) */ + double a; + //a = (double *)malloc(1*1*sizeof(double)); + a = -sqrt(vvt[0]/wwt[0]); + + for(i=0;i<row;i++){ + out1[i] = x[i]*a+inp1[i]; + } + + /* norm of out1 */ + double r; + r = dnorma(out1,row,1,2); + + for(i=0;i<row;i++){ + out1[i]=out1[i]/r; + } +} diff --git a/2.3-1/src/c/linearAlgebra/includes/fullrf.h b/2.3-1/src/c/linearAlgebra/includes/fullrf.h new file mode 100644 index 00000000..cc0a33d0 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/fullrf.h @@ -0,0 +1,26 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __FULLRF_H__ +#define __FULLRF_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dfullrfa(int ninp,double *in1,int row,int col,double tol,double *out1,double *out2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__FULLRF_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/givens.h b/2.3-1/src/c/linearAlgebra/includes/givens.h new file mode 100644 index 00000000..4aac91b2 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/givens.h @@ -0,0 +1,25 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __GIVENS_H__ +#define __GIVENS_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void dgivensa(int ninp,double *inp1,int row,int col,double *inp2,int row1,int col1,int nout,double *out1,double *out2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__givens_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/householder.h b/2.3-1/src/c/linearAlgebra/includes/householder.h new file mode 100644 index 00000000..64350a15 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/householder.h @@ -0,0 +1,26 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __HOUSEHOLDER_H__ +#define __HOUSEHOLDER_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dhouseholdera(int ninp,double *inp1,int row,double *inp2,double *out1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__HOUSEHOLDER_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/qr.h b/2.3-1/src/c/linearAlgebra/includes/qr.h new file mode 100644 index 00000000..2ed12e3a --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/qr.h @@ -0,0 +1,26 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __QR_H__ +#define __QR_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dqra(int ninp,int nout,double *inp1,int M,int N,double tol,double *out1,double *out2,double *out3); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__QR_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/rowcomp.h b/2.3-1/src/c/linearAlgebra/includes/rowcomp.h new file mode 100644 index 00000000..faf5a2a7 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/rowcomp.h @@ -0,0 +1,26 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __ROWCOMP_H__ +#define __ROWCOMP_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double drowcompa(int ninp,double *A,int row,int col,char *flag,double tol,double *w); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__ROWCOMP_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/sqroot.h b/2.3-1/src/c/linearAlgebra/includes/sqroot.h new file mode 100644 index 00000000..9c1d9652 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/sqroot.h @@ -0,0 +1,26 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __SQROOT_H__ +#define __SQROOT_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dsqroota(double *inp,int row,int col,double *out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__SQROOT_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_fullrf.h b/2.3-1/src/c/linearAlgebra/interfaces/int_fullrf.h new file mode 100644 index 00000000..1b8a067b --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_fullrf.h @@ -0,0 +1,28 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_FULLRF_H__ +#define __INT_FULLRF_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2fullrfd2d2d0(in1,size,out1,out2) dfullrfa(1,in1,size[0],size[1],0,out1,out2); +#define d2d0fullrfd2d2d0(in1,size,in2,out1,out2) dfullrfa(2,in1,size[0],size[1],in2,out1,out2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_FULLRF_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h b/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h new file mode 100644 index 00000000..ba30dbce --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h @@ -0,0 +1,32 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_GIVENS_H__ +#define __INT_GIVENS_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2givensd2(in1,size,out1) dgivensa(1,in1,size[0],size[1],NULL,0,0,1,out1,NULL); +#define d2givensd2d2(in1,size,out1,out2) dgivensa(1,in1,size[0],size[1],NULL,0,0,2,out1,out2); + +#define d0d0givensd2d2(in1,in2,out1,out2) dgivensa(2,&in1,1,1,&in2,1,1,2,out1,out2); +#define d0d0givensd2(in1,out1) dgivensa(2,&in1,1,1,&in2,1,1,1,out1,NULL); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_GIVENS_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_householder.h b/2.3-1/src/c/linearAlgebra/interfaces/int_householder.h new file mode 100644 index 00000000..f8637197 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_householder.h @@ -0,0 +1,28 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_HOUSEHOLDER_H__ +#define __INT_HOUSEHOLDER_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2householderd2(in1,size,out1) dhouseholdera(1,in1,size[0],NULL,out2); +#define d2d2householderd2(in1,size1,in2,size2,out1) dhouseholdera(2,in1,size1[0],in2,out1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_HOUSEHOLDER_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h b/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h new file mode 100644 index 00000000..d34d8f41 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h @@ -0,0 +1,34 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_QR_H__ +#define __INT_QR_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2qrd2d2(in1,size,out1,out2) dqra(1,2,in1,size[0],size[1],0,out1,out2,NULL); +#define d2qrd2d2d2(in1,size,out1,out2,out3) dqra(1,3,in1,size[0],size[1],0,out1,out2,out3); +#define d2g2qrd2d2(in1,size,in2,size1,out1,out2) dqra(2,2,in1,size[0],size[1],0,out1,out2,NULL); +#define d2g2qrd2d2d2(in1,size,in2,size1,out1,out2,out3) dqra(2,3,in1,size[0],size[1],0,out1,out2,out3); +#define d2d0qrd2d2d0d2(in1,size,in2,out1,out2,out3) dqra(2,4,in1,size[0],size[1],in2,out1,out2,out3); +#define d2qrd2d2d0d2(in1,size,out1,out2,out3) dqra(1,4,in1,size[0],size[1],0,out1,out2,out3); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_HESS_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.h b/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.h new file mode 100644 index 00000000..b72687d5 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.h @@ -0,0 +1,29 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_ROWCOMP_H__ +#define __INT_ROWCOMP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2rowcompd2d0(in1,size,out1) drowcompa(1,in1,size[0],size[1],NULL,0,out1); +#define d2g2rowcompd2d0(in1,size,flag,size1,out1) drowcompa(2,in1,size[0],size[1],flag,0,out1); +#define d2g2d0rowcompd2d0(in1,size,flag,size1,tol,out1) drowcompa(2,in1,size[0],size[1],flag,tol,out1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_ROWCOMP_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_sqroot.h b/2.3-1/src/c/linearAlgebra/interfaces/int_sqroot.h new file mode 100644 index 00000000..57af2c08 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_sqroot.h @@ -0,0 +1,27 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_SQROOT_H__ +#define __INT_SQROOT_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2sqrootd2(inp,size,out) dsqroota(inp,size[0],size[1],out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_HESS_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/proj/dproja.c b/2.3-1/src/c/linearAlgebra/proj/dproja.c new file mode 100644 index 00000000..e27cd6f2 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/proj/dproja.c @@ -0,0 +1,73 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Scilab function proj code in C */ + +#include <stdio.h> +#include <stdlib.h> +#include "proj.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include <math.h> +#include "norm.h" + + +double dproja(double *x1,int l,int k,double *x2,int m2,int n2,double *y){ + int i,j; + double *w; + w = (double *)malloc(l*l*sizeof(double)); + double rk; + rk = drowcompa(1,x1,l,k,NULL,0,w); + + double *w1; + w1 = (double *)malloc(rk*l*sizeof(double)); + + for(i=0;i<l*rk;i++){ + w1[i]=w[i]; + } + + double *x1t; + x1t = (double *)malloc((l-n)*l*sizeof(double); + + for(i=n;i<l;i++){ + for(j=0;j<l;j++){ + x1t[i-n+j*l] = w1[i+j*l]; + } + } + + double x1x2; + x1x2 = (double *)malloc((l-n+1)*n2*sizeof(double)); + dmulma(x1t,l-n+1,l,x2,m2,n2,x1x2); + + double *inx1x2; + inx1x2 = (double *)malloc(); + + + + + + + + + + + + + + + + + + + +} diff --git a/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c b/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c new file mode 100644 index 00000000..aea9713e --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c @@ -0,0 +1,67 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* PROJSPEC function in scilab */ + +/* + //[S,P,D,index]=projspec(A) + //Spectral characteristics of A at 0 + //S = reduced resolvent at 0 (S=-Drazin_inverse(A)) + //P = spectral projection at 0 + //D = Nilpotent operator at 0 + //index = index of the 0 eigenvalue + //! + +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "norm.h" +#include "eye.h" + +#define eps pow(2,-52) + +double dprojspeca(double *inp1,int row,int col,double *out1,double *out2,double *out3){ + double tol = pow(10,-6); + int i,j,index; + /*norm(A,1)*/ + double nor; + nor = dnorma(inp1,row,col,1); + + /* P=eye(A),D=A,S=0*P;index=1; */ + if(nor < eps*row*row){ + memcpy(out2,inp1,row*col*sizeof(double)); + deyea(out2,row,col); + memcpy(out3,inp1,row*col*sizeof(double)); + for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + out1[i*row+j] = 0; + } + } + index = 1; + } + + /* rcond(A) */ + double *rcon; + rcon = rcond(inp1,row); + if(rcon > tol){ + dinverma(inp1,out1,row); + for(i=0;i<row*col;i++){ + out2[i]=0; + out3[i]=0; + } + index = 0; + return index; + } + index = 1; +} diff --git a/2.3-1/src/c/linearAlgebra/qr/dqra.c b/2.3-1/src/c/linearAlgebra/qr/dqra.c new file mode 100644 index 00000000..bae4bc27 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/qr/dqra.c @@ -0,0 +1,298 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* This C code is used to generate function for QR decomposition */ + +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "qr.h" +#include "lapack.h" +#include "string.h" +#include "matrixTranspose.h" + +/*For reference check Scilab source code & lapack library websites +Names of variable are almost same for convience. +*/ +/* +int min(int M,int N){ + if(M > N) return N; + return M; +} + +int max(int M,int N){ + if(M > N) return N; + return N; +}*/ + +/* External Function used of lapack library */ +extern double dgeqrf_(int *,int *,double *,int *,double *,double *,int *,int *); +extern double dlacpy_(char *,int *,int *,double *,int *,double *,int *); +extern double dgeqpf_(int *,int *,double *,int *,int *,double *,double *,int *); +extern double dorgqr_(int *,int *,int *,double *,int *,double *,double *,int *,int *); +extern void dlaset_(char *,int *,int *,double *,double *,double *,int *); + +/* function for finding qr */ +double dqra(int ninp,int nout,double *inp1,int M,int N,double tol,double *out1,double *out2,double *out3){ + int i,j; + char choice; + double alpha=0.0,beta=0.0; + int minMN = min(M,N); + + double *A; + A = (double *)malloc(M*N*sizeof(double)); + memcpy(A,inp1,M*N*sizeof(double)); + + if(M <= 0 || N <= 0){ + out1 = NULL; + out2 = NULL; + return 0; + } + /* doldqr */ + if(nout == 4){ /* [Q,R,rk,E]=qr(X [,tol]) */ + if(ninp == 1){ + tol = -1; + } + + int INFO,rk; + + int *JPVT; + JPVT = ( int *)malloc(N*sizeof(int)); + + double *TAU; + TAU = (double *)malloc(minMN*sizeof(double)); + + int LWORK = 3*N; + + double *WORK; + WORK = (double *)malloc(LWORK*sizeof(double)); + + for(i=1;i<=M;i++){ + JPVT[i-1]=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + + choice = 'U'; + dlacpy_(&choice,&M,&N,A,&M,out2,&M); + + if(M > N){ + for(j=1;j<=N;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + for(j=1;j<=M-1;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + + if(M > N){ + choice = 'F'; + dlacpy_(&choice,&M,&N,A,&M,out1,&M); + for(j=N+1;j<=M;j++){ + for(i=1;i<=M;i++){ + out1[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + choice = 'F'; + dlacpy_(&choice,&M,&M,A,&M,out1,&M); + } + + dorgqr_(&M,&M,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + + for(j=1;j<=N;j++){ + i = JPVT[j-1]; + out3[i-1+(j-1)*N] = 1.0; + } + + double tt = abs(out2[0]); + + if(tol == -1){ + tol = (double)max(M,N)*pow(2,-52)*tt; + } + double ch; + //printf("%lf ",tol); + for(j=1;j<=minMN;j++){ + //printf("%e ",out2[(j-1)+(j-1)*M]); + if(out2[(j-1)+(j-1)*M] < 0){ + ch = -out2[(j-1)+(j-1)*M]; + } + else{ + ch = out2[(j-1)+(j-1)*M]; + } + if(ch > tol){ + rk = j; + } + else{ + break; + } + } + //printf("\n"); + return rk; + } + else if(ninp == 1){ + /* (intdgeqpf3) + [Q,R]=qr(A) + [Q,R,E]=qr(A) + */ + int LDA = M; + + double *TAU; + TAU = (double *)malloc(min(M,N)*sizeof(double)); + + int LWORK; + if(nout <= 2) + LWORK = N; + else + LWORK = 3*N; + + double *WORK; + WORK = (double *)malloc((LWORK+1)*sizeof(double)); + + int INFO; + + int *JPVT; + JPVT = (int *)malloc(N*sizeof(int)); + + if(nout <= 2){ + dgeqrf_(&M,&N,A,&M,TAU,WORK,&LWORK,&INFO); + } + else{ + for(i=0;i<N;i++){ + *(JPVT+i)=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + } + + /* Copying code from A to R */ + choice = 'U'; + dlacpy_(&choice,&M,&N,A,&M,out2,&M); + /*for(i=0;i<M;i++){ + for(j=0;j<N-i;j++){ + out2[i+j*M] = A[i+j*M]; + } + }*/ + + if(M > N){ + for(j=1;j<=N;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + for(j=1;j<=M-1;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + /* lQ - out1 */ + if(M > N){ + choice = 'F'; + dlacpy_(&choice,&M,&N,A,&M,out1,&M); + /*for(i=0;i<M*N;i++){ + out1[i]=A[i]; + }*/ + for(j=N+1;j<=M;j++){ + for(i=1;i<=M;i++){ + out1[i+(j-1)*M] = 0.0; + } + } + } + else{ + choice = 'F'; + dlacpy_(&choice,&M,&M,A,&M,out1,&M); + /*for(i=0;i<M;i++){ + for(j=0;j<M;j++){ + out1 + } + }*/ + } + dorgqr_(&M,&M,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + if(nout > 2){ + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + for(j=1;j<=N;j++){ + i = *(JPVT+j-1); + //printf("%d ",i-1+(j-1)*N); + *(out3+i-1+(j-1)*N) = 1.0; + } + //printf("\n"); + } + } + else{/* + [[Q,R]=qr(A,'e') + [Q,R,E]=qr(A,'e') ] */ + int *JPVT; + JPVT = (int *)malloc(N*sizeof(int)); + + double *TAU; + TAU = (double *)malloc(min(M,N)*sizeof(double)); + int LWORK; + if(nout <= 2){ + LWORK = N; + } + else{ + LWORK = 3*N; + } + + double *WORK; + WORK = (double *)malloc(LWORK*sizeof(double)); + + int INFO; + if(nout <= 2) + dgeqrf_(&M,&N,A,&M,TAU,WORK,&LWORK,&INFO); + else{ + for(i=1;i<=N;i++){ + JPVT[i-1]=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + } + choice = 'U'; + + dlacpy_(&choice,&minMN,&N,A,&M,out2,&minMN); + + if(N >= 2){ + for(j=1;j<=N-1;j++){ + if(j+1 <= minMN){ + for(i=j+1;i<=minMN;i++){ + out2[i-1+(j-1)*minMN] = 0.0; + } + } + } + } + choice = 'F'; + dlacpy_(&choice,&M,&minMN,A,&M,out1,&M); + dorgqr_(&M,&minMN,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + if(nout > 2){ + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + for(j=1;j<=N;j++){ + i = JPVT[j-1]; + out3[i-1+(j-1)*N] = 1.0; + } + } + } + return 0; +} diff --git a/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c b/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c new file mode 100644 index 00000000..3161a2d6 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c @@ -0,0 +1,79 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* This function is used to find row compression, range */ + +#include "rowcomp.h" +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "svd.h" +#include "norm.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "qr.h" + +/* All variable names, are in consideration of scilab documentation. for reference please check the scilab code.*/ + +double drowcompa(int ninp,double *A,int row,int col,char *flag,double tol,double *w){ + double rk; + double *U; + double *S; + double *V; + double *q,*r,*e; + if(row == 0 || col == 0){ + w = NULL; + return 0; + } + + double nA1 = dnorma(A,row,col,1); + if(nA1 < sqrt(pow(2,-52))/10){ + deyea(w,row,col); + return 0; + } + if(ninp == 1){ + flag = "svd"; + tol = sqrt(pow(2,-52))*nA1; + } + else if(ninp == 2){ + tol = sqrt(pow(2,-52))*nA1; + } + else{ + if(tol < 0){ /* if tolerance is negative */ + printf(" Wrong values for input argument #: Non-negative scalar expected"); + } + } + int M = row,N=col; + int minMN = min(M,N); + char check[3]="qr"; + //printf(" %s ",flag); + if(strcmp(check,flag) == 0){ + /* calling qr function*/ + //printf(" * "); + q = (double *)malloc(M*min(M,N)*sizeof(double)); + r = (double *)malloc(minMN*N*sizeof(double)); + e = (double *)malloc(N*N*sizeof(double)); + rk = dqra(2,4,A,M,N,tol,q,r,e); + memcpy(w,q,row*col*sizeof(double)); + dtransposea(q,row,row,w); + return rk; + } + else{ + /* svd function type */ + U = (double *)malloc(row*row*sizeof(double)); + S = (double *)malloc(row*col*sizeof(double)); + V = (double *)malloc(col*col*sizeof(double)); + rk = dsvda(tol,A,row,col,0,4,U,S,V); + dtransposea(U,row,row,w); + return rk; + } +} diff --git a/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c b/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c new file mode 100644 index 00000000..1ba97268 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c @@ -0,0 +1,130 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Function - sqroot of scilab, W*W' hermitian factorization */ + +#include <stdio.h> +#include "stdlib.h" +#include "string.h" +#include <math.h> +#include "matrixTranspose.h" +#include "svd.h" +#include "matrixMultiplication.h" + +#define eps 2.22044604925e-16 + +/*It would be good, if you are doing conversoins for only valid inputs before + running the program, check all the conditions before hand. +*/ + +void dsqroota(double *inp,int row,int col, double *out){ + if(row != col){ + printf("Enter valid inputs only - matrix should be symetric\n"); + return; + } + int i,j; + double *U,*S,*V; + double *A,*B; + int rk; + + U = (double *)malloc((double)row*row*sizeof(double)); + S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); + V = (double *)malloc((double)col*col*sizeof(double)); + A = (double *)malloc(rk*rk*sizeof(double)); + B = (double *)malloc(rk*row*sizeof(double)); + + double *Q1; + Q1 = (double *)malloc(row*col*sizeof(double)); + + dtransposea(inp,row,col,Q1); + + double *Q2; + Q2 = (double *)malloc(col*row*sizeof(double)); + + /* Q2 = (inp+inp1')/2; */ + for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + Q2[i+j*row] = ((inp[i+j*row]+Q1[i+j*row])/2); + } + } + + /* norm(Q2-Q1,1) - finding the max value from sum of columns */ + double sum = 0; + double maxi=0; + for(i=0;i<row;i++){ + sum = 0; + for(j=0;j<col;j++) sum+=(Q2[i*row+j]-inp[i*row+j]); + if(maxi < sum){ + maxi = sum; + } + } + + /* if norm(Q1-Q,1) > 100*%eps then */ + if(maxi > 100*eps){ + printf("Warning: Wrong size for input argument and Symmetric expected\n"); + } + maxi = 0; + for(i=0;i<col;i++){ + sum=0; + for(j=0;j<row;j++) sum+=Q1[i*row+j]; + if(maxi < sum){ + maxi = sum; + } + } + + /*if norm(Q,1) < sqrt(%eps) then S=[];return;end*/ + + if(maxi < sqrt(eps)){ + out = NULL; + } + else{ + rk = dsvda(0,inp,row,col,0,4,U,S,V); + + /*Will be used in complex numbers*/ + //C = (double *)malloc(rk*row*sizeof(double)); + + /*for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + printf("%lf ",S[i*row+j]); + } + printf("\n"); + }*/ + /*sqrt of S*/ + //printf("%d ",rk); + for(i=0;i<rk;i++){ + for(j=0;j<rk;j++){ + A[i*rk+j] = sqrt(S[i*row+j]); + //printf("%lf ",A[i*rk+j]); + } + } + for(i=0;i<col*rk;i++){ + B[i] = V[i]; + //printf("%lf ",B[i]); + } + //printf("\n"); + /*for(i=0;i<rk;i++){ + for(j=0;j<rk;j++){ + //A[i*rk+j] = sqrt(S[i*row+j]); + printf("%lf ",A[i*rk+j]); + } + printf("\n"); + }*/ + /*for(i=0;i<col;i++){ + for(j=0;j<rk;j++){ + //B[i*col+j] = VT[i*col+j]; + printf("%lf ",B[i*col+j]); + } + printf("\n"); + }*/ + dmulma(B,col,rk,A,rk,rk,out); + } +} diff --git a/2.3-1/src/c/linearAlgebra/sva/dsvaa.c b/2.3-1/src/c/linearAlgebra/sva/dsvaa.c index b7d07d8c..691694e4 100644 --- a/2.3-1/src/c/linearAlgebra/sva/dsvaa.c +++ b/2.3-1/src/c/linearAlgebra/sva/dsvaa.c @@ -20,6 +20,7 @@ #define eps 2.22044604925e-16 +/* Ref: Scilab source code */ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ double *out2,double *out3){ @@ -33,14 +34,14 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ /* Calculation of svd of a given matrix */ double *U,*S,*V; - U = (double *)malloc((double)row*min(row,col)*sizeof(double)); - S = (double *)malloc((double)min(row,col)*min(row,col)*sizeof(double)); - V = (double *)malloc((double)col*min(row,col)*sizeof(double)); + U = (double *)malloc((double)row*Min(row,col)*sizeof(double)); + S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); + V = (double *)malloc((double)col*Min(row,col)*sizeof(double)); dsvda(0,in1,M,N,1,3,U,S,V); if (ninp == 1){ /* [u,s,v] = sva(A) when input is only matrix */ - tol = max(row,col)*S[0]*eps; + tol = Max(row,col)*S[0]*eps; rk = 0; for(i=0;i<col;i++){ if(S[i+i*row] > tol){ @@ -52,7 +53,7 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ tol = in2; if(tol > 1){ rk = tol; - if(rk > min(row,col)){ + if(rk > Min(row,col)){ printf("ERROR: Wrong value for input argument !"); out1 = NULL; out2 = NULL; @@ -70,21 +71,21 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ } } arow = M; - acol = min(M,N); + acol = Min(M,N); /* Copying, the output in required format */ for(i=0;i<arow;i++){ for(j=0;j<rk;j++){ out1[i+j*row]=U[i+j*arow]; } } - arow = min(M,N); - for(i=0;i<rk;i++){ + arow = Min(M,N); + for(i=0;i<rk;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out2[i+j*(int)rk] = S[i+j*arow]; } } arow = N; - acol = min(M,N); - for(i=0;i<arow;i++){ + acol = Min(M,N); + for(i=0;i<arow;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out3[i+j*arow] = V[i+j*arow]; } diff --git a/2.3-1/src/c/linearAlgebra/svd/.1.c.swp b/2.3-1/src/c/linearAlgebra/svd/.1.c.swp Binary files differnew file mode 100644 index 00000000..81d9e9cf --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/svd/.1.c.swp diff --git a/2.3-1/src/c/linearAlgebra/svd/zsvda.c b/2.3-1/src/c/linearAlgebra/svd/zsvda.c index 0d360222..c75cc50c 100644 --- a/2.3-1/src/c/linearAlgebra/svd/zsvda.c +++ b/2.3-1/src/c/linearAlgebra/svd/zsvda.c @@ -19,6 +19,7 @@ #include "matrixTranspose.h" #include "conj.h" +/* Lapack functions used . */ extern doubleComplex zgesvd_( char* , char* , int* , int* ,doubleComplex *,\ int* , double* ,doubleComplex* , int* ,doubleComplex* , int* ,\ doubleComplex* , int* , double* , int* ); @@ -113,7 +114,16 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o out3[i+j*N] = zconjs(VT[j+i*N]); out3[j+i*N] = zconjs(VT[i+j*N]); } - } + } + /* output from zgesvd is copied to out2 variables in required format*/ + for(j=0;j<M;j++){ + for(k=0;k<N;k++){ + if(j == k) + out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); + else + out2[j*(Min(M,N))+k] = DoubleComplex(0,0); + } + } //ztransposea(VT,LDVT,Min(M,N),out3); /*for(i=0;i<N;i++){ for(j=0;j<N;j++){ @@ -124,7 +134,7 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o //free(U); //free(VT); } - else{ + else{ /*svd(x,'e')*/ LDA = M; LDU = M; if(M > N){ @@ -156,18 +166,18 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o for(j=0;j<N;j++){ out3[j+i*N] = zconjs(VT[i+j*Min(M,N)]); } - } + } + /* output from zgesvd is copied to out2 variables in required format*/ + for(j=0;j<Min(M,N);j++){ + for(k=0;k<Min(M,N);k++){ + if(j == k) + out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); + else + out2[j*(Min(M,N))+k] = DoubleComplex(0,0); + } + } //free(U); //free(VT); } - /* output from zgesvd is copied to out2 variables in required format*/ - for(j=0;j<Min(M,N);j++){ - for(k=0;k<Min(M,N);k++){ - if(j == k) - out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); - else - out2[j*(Min(M,N))+k] = DoubleComplex(0,0); - } - } } } diff --git a/2.3-1/src/c/matrixOperations/includes/norm.h b/2.3-1/src/c/matrixOperations/includes/norm.h index dc9d351f..4fe3872c 100644 --- a/2.3-1/src/c/matrixOperations/includes/norm.h +++ b/2.3-1/src/c/matrixOperations/includes/norm.h @@ -5,7 +5,7 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ diff --git a/2.3-1/src/c/matrixOperations/includes/spec.h b/2.3-1/src/c/matrixOperations/includes/spec.h deleted file mode 100644 index b7b7d35c..00000000 --- a/2.3-1/src/c/matrixOperations/includes/spec.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - - -#ifndef __SPEC_H__ -#define __SPEC_H__ - -#include "dynlib_matrixoperations.h" -#include "doubleComplex.h" -#include "floatComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* spec gives only the eigenvalues - If you want the eigenvalues and the eigenvectors, use spec2 */ - -/* spec */ -#define sspecs(in) in -#define dspecs(in) in -#define cspecs(in) in -#define zspecs(in) in - -EXTERN_MATOPS void sspeca(float* in, int rows, float* out); -EXTERN_MATOPS void dspeca(double* in, int rows, double* out); -EXTERN_MATOPS void cspeca(floatComplex* in, int rows, floatComplex* out); -EXTERN_MATOPS void zspeca(doubleComplex* in, int rows,doubleComplex* out); - - - -/* spec2 */ -#define sspec2s(in,out) sspecs(1);*out=in; -#define dspec2s(in,out) dspecs(1);*out=in; -#define cspec2s(in,out) cspecs(FloatComplex(1,0));*out=FloatComplex(creals(in),cimags(in)); -#define zspec2s(in,out) zspecs(DoubleComplex(1,0));*out=DoubleComplex(zreals(in),zimags(in)); - -EXTERN_MATOPS void sspec2a(float* in, int rows, float* eigenvalues,float* eigenvectors); -EXTERN_MATOPS void dspec2a(double* in, int rows, double* eigenvalues,double* eigenvectors); -EXTERN_MATOPS void cspec2a(floatComplex* in, int rows, floatComplex* eigenvalues,floatComplex* eigenvectors); -EXTERN_MATOPS void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues,doubleComplex* eigenvectors); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPEC_H__ */ diff --git a/2.3-1/src/c/matrixOperations/includes/toeplitz.h b/2.3-1/src/c/matrixOperations/includes/toeplitz.h new file mode 100644 index 00000000..7384b43c --- /dev/null +++ b/2.3-1/src/c/matrixOperations/includes/toeplitz.h @@ -0,0 +1,37 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __TOEPLITZ_H__ +#define __TOEPLITZ_H__ +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dtoeplitza(double* inp1,int size1,double* inp2,int size2,double* oup); +void u8toeplitza(uint8* inp1,int size1,uint8* inp2,int size2,uint8* oup); +void u16toeplitza(uint16* inp1,int size1,uint16* inp2,int size2,uint16* oup); +void ztoeplitza(doubleComplex* inp1,int size1,doubleComplex* inp2,int size2,doubleComplex* oup); +void gtoeplitza(char* inp1,int size1,char* inp2,int size2,char* oup); +void stoeplitza(float* inp1,int size1,float* inp2,int size2,float* oup); +void ctoeplitza(floatComplex* inp1,int size1,floatComplex* inp2,int size2,floatComplex* oup); +void i8toeplitza(int8* inp1,int size1,int8* inp2,int size2,int8* oup); +void i16toeplitza(int16* inp1,int size1,int16* inp2,int size2,int16* oup); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__TOEPLITZ_H__*/ diff --git a/2.3-1/src/c/matrixOperations/interfaces/int_spec.h b/2.3-1/src/c/matrixOperations/interfaces/int_spec.h deleted file mode 100644 index 77ab55e7..00000000 --- a/2.3-1/src/c/matrixOperations/interfaces/int_spec.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - -#ifndef __INT_SPEC_H__ -#define __INT_SPEC_H__ - -/* Only eigenvalues */ - -#define s0specc0(in) FloatComplex (sspecs(in) , 0) - -#define d0specz0(in) DoubleComplex ( dspecs(in) , 0) - -#define c0specc0(in) cspecs(in) - -#define z0specz0(in) zspecs(in) - -#define s2specc2(in,size,out) {float* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(float)));\ - szerosa(ZEROS,size[0],size[0]);\ - cspeca(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0], out);\ - } - -#define d2specz2(in,size,out) {double* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(double)));\ - dzerosa(ZEROS,size[0],size[0]);\ - zspeca(DoubleComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out);\ - } - -#define c2specc2(in,size,out) cspeca(in, size[0], out) - -#define z2specz2(in,size,out) zspeca(in, size[0], out) - -/* Eigenvalues and eigenvectors */ - -#define s0specc0c0(in,out) cspec2s(FloatComplex( in,0) ,out) - -#define d0specz0z0(in,out) zspec2s(DoubleComplex(in,0) ,out) - -#define c0specc0c0(in,out) cspec2s(in,out) - -#define z0specz0z0(in,out) zspec2s(in,out) - -#define s2specc2c2(in,size,out1,out2) {float* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(float)));\ - szerosa(ZEROS,size[0],size[0]);\ - cspec2a(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out1 , out2 );\ - } - -#define d2specz2z2(in,size,out1,out2) {double* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(double)));\ - dzerosa(ZEROS,size[0],size[0]);\ - zspec2a(DoubleComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out1 , out2 );\ - } - - -#define c2specc2c2(in,size,out1,out2) cspec2a(in, size[0], out2, out1) - -#define z2specz2z2(in,size,out1,out2) zspec2a(in, size[0], out2, out1) - -#endif /* !__INT_SPEC_H__ */ diff --git a/2.3-1/src/c/matrixOperations/interfaces/int_toeplitz.h b/2.3-1/src/c/matrixOperations/interfaces/int_toeplitz.h new file mode 100644 index 00000000..b602e9a8 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/interfaces/int_toeplitz.h @@ -0,0 +1,50 @@ + /* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __INT_TOEPLITZ_H__ +#define __INT_TOEPLITZ_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2d2toeplitzd2(in1,size1,in2,size2,out) dtoeplitza(in1,size1[1],in2,size2[1],out) +#define d2toeplitzd2(in1,size1,out) dtoeplitza(in1,size1[1],in1,size1[1],out) + +#define u82u82toeplitzu82(in1,size1,in2,size2,out) u8toeplitza(in1,size1[1],in2,size2[1],out) +#define u82toeplitzu82(in1,size1,out) u8toeplitza(in1,size1[1],in1,size1[1],out) + +#define u162u162toeplitzu162(in1,size1,in2,size2,out) u16toeplitza(in1,size1[1],in2,size2[1],out) +#define u162toeplitzu162(in1,size1,out) u16toeplitza(in1,size1[1],in1,size1[1],out) + +#define g2g2toeplitzg2(in1,size1,in2,size2,out) gtoeplitza(in1,size1[1],in2,size2[1],out) +#define g2toeplitzg2(in1,size1,out) gtoeplitza(in1,size1[1],in1,size1[1],out) + +#define z2z2toeplitzz2(in1,size1,in2,size2,out) ztoeplitza(in1,size1[1],in2,size2[1],out) +#define z2toeplitzz2(in1,size1,out) ztoeplitza(in1,size1[1],in1,size1[1],out) + +#define s2s2toeplitzs2(in1,size1,in2,size2,out) stoeplitza(in1,size1[1],in2,size2[1],out) +#define s2toeplitzs2(in1,size1,out) stoeplitza(in1,size1[1],in1,size1[1],out) + +#define c2c2toeplitzc2(in1,size1,in2,size2,out) ctoeplitza(in1,size1[1],in2,size2[1],out) +#define c2toeplitzc2(in1,size1,out) ctoeplitza(in1,size1[1],in1,size1[1],out) + +#define i82i82toeplitzi82(in1,size1,in2,size2,out) i8toeplitza(in1,size1[1],in2,size2[1],out) +#define i82toeplitzi82(in1,size1,out) i8toeplitza(in1,size1[1],in1,size1[1],out) + +#define i162i162toeplitzi162(in1,size1,in2,size2,out) i16toeplitza(in1,size1[1],in2,size2[1],out) +#define i162toeplitzi162(in1,size1,out) i16toeplitza(in1,size1[1],in1,size1[1],out) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_TOEPLITZ_H__*/ diff --git a/2.3-1/src/c/matrixOperations/norm/dnorma.c b/2.3-1/src/c/matrixOperations/norm/dnorma.c index c912f857..2bb9b8b7 100644 --- a/2.3-1/src/c/matrixOperations/norm/dnorma.c +++ b/2.3-1/src/c/matrixOperations/norm/dnorma.c @@ -6,6 +6,8 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani + + Edited by: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -14,13 +16,17 @@ /*Acceptable norms are: 1, 2, 'inf', 'fro', */ #include "norm.h" +#include "svd.h" #include <math.h> +#include <stdio.h> +#include<stdlib.h> double dnorma (double *in, int row, int col, int norm) { double res = 0, sum = 0; int col_count, row_count; - + double *S; + S = (double *)malloc(min(row,col)*sizeof(double)); switch (norm) { case 1: /*largest column sum*/ @@ -37,6 +43,8 @@ double dnorma (double *in, int row, int col, int norm) break; case 2: /*Largest singular value of the matrix*/ + dsvda(0,in,row,col,0,1,S,NULL,NULL); + res = S[0]; break; case 3: /*inf: largest row sum*/ @@ -69,4 +77,4 @@ double dnorma (double *in, int row, int col, int norm) return res; -}
\ No newline at end of file +} diff --git a/2.3-1/src/c/matrixOperations/spec/Makefile.am b/2.3-1/src/c/matrixOperations/spec/Makefile.am deleted file mode 100644 index 90dbd0aa..00000000 --- a/2.3-1/src/c/matrixOperations/spec/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libSpec_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libSpec.la - -HEAD = ../includes/spec.h - -libSpec_la_SOURCES = $(HEAD) \ - sspeca.c \ - dspeca.c \ - cspeca.c \ - zspeca.c - - -############ -## CHECK -############ - - -check_PROGRAMS = testDoubleSpec testFloatSpec - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec_SOURCES = testDoubleSpec.c -testDoubleSpec_LDADD = $(check_LDADD) -testDoubleSpec_CFLAGS = $(check_INCLUDES) - -testFloatSpec_SOURCES = testFloatSpec.c -testFloatSpec_LDADD = $(check_LDADD) -testFloatSpec_CFLAGS = $(check_INCLUDES) - -TESTS = testDoubleSpec testFloatSpec - diff --git a/2.3-1/src/c/matrixOperations/spec/Makefile.in b/2.3-1/src/c/matrixOperations/spec/Makefile.in deleted file mode 100644 index 9c34c9e6..00000000 --- a/2.3-1/src/c/matrixOperations/spec/Makefile.in +++ /dev/null @@ -1,755 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT) -TESTS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT) -subdir = src/c/matrixOperations/spec -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libSpec_la_LIBADD = -am__objects_1 = -am_libSpec_la_OBJECTS = $(am__objects_1) libSpec_la-sspeca.lo \ - libSpec_la-dspeca.lo libSpec_la-cspeca.lo libSpec_la-zspeca.lo -libSpec_la_OBJECTS = $(am_libSpec_la_OBJECTS) -libSpec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libSpec_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testDoubleSpec_OBJECTS = testDoubleSpec-testDoubleSpec.$(OBJEXT) -testDoubleSpec_OBJECTS = $(am_testDoubleSpec_OBJECTS) -testDoubleSpec_DEPENDENCIES = $(check_LDADD) -testDoubleSpec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSpec_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testFloatSpec_OBJECTS = testFloatSpec-testFloatSpec.$(OBJEXT) -testFloatSpec_OBJECTS = $(am_testFloatSpec_OBJECTS) -testFloatSpec_DEPENDENCIES = $(check_LDADD) -testFloatSpec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFloatSpec_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libSpec_la_SOURCES) $(testDoubleSpec_SOURCES) \ - $(testFloatSpec_SOURCES) -DIST_SOURCES = $(libSpec_la_SOURCES) $(testDoubleSpec_SOURCES) \ - $(testFloatSpec_SOURCES) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libSpec_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libSpec.la -HEAD = ../includes/spec.h -libSpec_la_SOURCES = $(HEAD) \ - sspeca.c \ - dspeca.c \ - cspeca.c \ - zspeca.c - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec_SOURCES = testDoubleSpec.c -testDoubleSpec_LDADD = $(check_LDADD) -testDoubleSpec_CFLAGS = $(check_INCLUDES) -testFloatSpec_SOURCES = testFloatSpec.c -testFloatSpec_LDADD = $(check_LDADD) -testFloatSpec_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/matrixOperations/spec/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/c/matrixOperations/spec/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libSpec.la: $(libSpec_la_OBJECTS) $(libSpec_la_DEPENDENCIES) - $(libSpec_la_LINK) -rpath $(pkglibdir) $(libSpec_la_OBJECTS) $(libSpec_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -testDoubleSpec$(EXEEXT): $(testDoubleSpec_OBJECTS) $(testDoubleSpec_DEPENDENCIES) - @rm -f testDoubleSpec$(EXEEXT) - $(testDoubleSpec_LINK) $(testDoubleSpec_OBJECTS) $(testDoubleSpec_LDADD) $(LIBS) -testFloatSpec$(EXEEXT): $(testFloatSpec_OBJECTS) $(testFloatSpec_DEPENDENCIES) - @rm -f testFloatSpec$(EXEEXT) - $(testFloatSpec_LINK) $(testFloatSpec_OBJECTS) $(testFloatSpec_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-cspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-dspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-sspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-zspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDoubleSpec-testDoubleSpec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFloatSpec-testFloatSpec.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libSpec_la-sspeca.lo: sspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-sspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-sspeca.Tpo -c -o libSpec_la-sspeca.lo `test -f 'sspeca.c' || echo '$(srcdir)/'`sspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-sspeca.Tpo $(DEPDIR)/libSpec_la-sspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sspeca.c' object='libSpec_la-sspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-sspeca.lo `test -f 'sspeca.c' || echo '$(srcdir)/'`sspeca.c - -libSpec_la-dspeca.lo: dspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-dspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-dspeca.Tpo -c -o libSpec_la-dspeca.lo `test -f 'dspeca.c' || echo '$(srcdir)/'`dspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-dspeca.Tpo $(DEPDIR)/libSpec_la-dspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspeca.c' object='libSpec_la-dspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-dspeca.lo `test -f 'dspeca.c' || echo '$(srcdir)/'`dspeca.c - -libSpec_la-cspeca.lo: cspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-cspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-cspeca.Tpo -c -o libSpec_la-cspeca.lo `test -f 'cspeca.c' || echo '$(srcdir)/'`cspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-cspeca.Tpo $(DEPDIR)/libSpec_la-cspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cspeca.c' object='libSpec_la-cspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-cspeca.lo `test -f 'cspeca.c' || echo '$(srcdir)/'`cspeca.c - -libSpec_la-zspeca.lo: zspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-zspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-zspeca.Tpo -c -o libSpec_la-zspeca.lo `test -f 'zspeca.c' || echo '$(srcdir)/'`zspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-zspeca.Tpo $(DEPDIR)/libSpec_la-zspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zspeca.c' object='libSpec_la-zspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-zspeca.lo `test -f 'zspeca.c' || echo '$(srcdir)/'`zspeca.c - -testDoubleSpec-testDoubleSpec.o: testDoubleSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -MT testDoubleSpec-testDoubleSpec.o -MD -MP -MF $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo -c -o testDoubleSpec-testDoubleSpec.o `test -f 'testDoubleSpec.c' || echo '$(srcdir)/'`testDoubleSpec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo $(DEPDIR)/testDoubleSpec-testDoubleSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec.c' object='testDoubleSpec-testDoubleSpec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -c -o testDoubleSpec-testDoubleSpec.o `test -f 'testDoubleSpec.c' || echo '$(srcdir)/'`testDoubleSpec.c - -testDoubleSpec-testDoubleSpec.obj: testDoubleSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -MT testDoubleSpec-testDoubleSpec.obj -MD -MP -MF $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo -c -o testDoubleSpec-testDoubleSpec.obj `if test -f 'testDoubleSpec.c'; then $(CYGPATH_W) 'testDoubleSpec.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo $(DEPDIR)/testDoubleSpec-testDoubleSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec.c' object='testDoubleSpec-testDoubleSpec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -c -o testDoubleSpec-testDoubleSpec.obj `if test -f 'testDoubleSpec.c'; then $(CYGPATH_W) 'testDoubleSpec.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec.c'; fi` - -testFloatSpec-testFloatSpec.o: testFloatSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -MT testFloatSpec-testFloatSpec.o -MD -MP -MF $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo -c -o testFloatSpec-testFloatSpec.o `test -f 'testFloatSpec.c' || echo '$(srcdir)/'`testFloatSpec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo $(DEPDIR)/testFloatSpec-testFloatSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec.c' object='testFloatSpec-testFloatSpec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -c -o testFloatSpec-testFloatSpec.o `test -f 'testFloatSpec.c' || echo '$(srcdir)/'`testFloatSpec.c - -testFloatSpec-testFloatSpec.obj: testFloatSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -MT testFloatSpec-testFloatSpec.obj -MD -MP -MF $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo -c -o testFloatSpec-testFloatSpec.obj `if test -f 'testFloatSpec.c'; then $(CYGPATH_W) 'testFloatSpec.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo $(DEPDIR)/testFloatSpec-testFloatSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec.c' object='testFloatSpec-testFloatSpec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -c -o testFloatSpec-testFloatSpec.obj `if test -f 'testFloatSpec.c'; then $(CYGPATH_W) 'testFloatSpec.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/2.3-1/src/c/matrixOperations/spec/cspeca.c b/2.3-1/src/c/matrixOperations/spec/cspeca.c deleted file mode 100644 index a2b6548b..00000000 --- a/2.3-1/src/c/matrixOperations/spec/cspeca.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void cspeca(floatComplex* in, int rows, floatComplex* out){ - /* As we use Lapack to find the eigenvalues, we must cast the floatComplex input into doubleComplex - and the doubleComplex output of dspeca into floatComplex*/ - - int i; - doubleComplex* dblin; - doubleComplex* dblout; - - dblin=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dblout=(doubleComplex*)malloc((unsigned int)rows*sizeof(doubleComplex)); - - for (i=0;i<rows*rows;i++) dblin[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i])); - - zspeca(dblin,rows,dblout); - - for (i=0;i<rows;i++) out[i]=FloatComplex((float)zreals(dblout[i]),(float)zimags(dblout[i])); -} diff --git a/2.3-1/src/c/matrixOperations/spec/dspeca.c b/2.3-1/src/c/matrixOperations/spec/dspeca.c deleted file mode 100644 index 1131ecf2..00000000 --- a/2.3-1/src/c/matrixOperations/spec/dspeca.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "max.h" - -void dspeca(double* in, int rows,double* out){ - int i=0, j=0; - int symmetric=0; - int INFO=0; - int iWorkSize = 0; - double* pdblWork; - double* outReal; - double* outImag; - double* pdblLeftvectors; - double* pdblRightvectors; - double* inCopy; - - inCopy = (double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - - iWorkSize = 3*rows; - pdblWork = (double*)malloc((unsigned int)iWorkSize * sizeof(double)); - - for(i=0;i<rows*rows;i++) inCopy[i]=in[i]; - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++) - for (j=0;j<rows;j++) - if (in[i*rows+j]!=in[i+j*rows]) break; - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) symmetric=1; - - - /* apply lapack function according to symmetry */ - if(symmetric){ - C2F(dsyev)( "N", "U", &rows, in, &rows, outReal, pdblWork, &iWorkSize, &INFO ); - } - else { - C2F(dgeev)( "N", "N", &rows, inCopy, &rows, outReal, outImag, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, &INFO ); - } - - for (i=0;i<rows;i++) out[i]=outReal[i]; - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblLeftvectors); - free(pdblRightvectors); -} - diff --git a/2.3-1/src/c/matrixOperations/spec/sspeca.c b/2.3-1/src/c/matrixOperations/spec/sspeca.c deleted file mode 100644 index 50751a29..00000000 --- a/2.3-1/src/c/matrixOperations/spec/sspeca.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void sspeca(float* in, int rows, float* out){ - /* As we use Lapack to find the eigenvalues, we must cast the float input into double - and the doubleComplex output of dspeca into floatComplex*/ - - int i; - double* dblin; - double* dblout; - - dblin=(double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dblout=(double*)malloc((unsigned int)rows*sizeof(double)); - - for (i=0;i<rows*rows;i++) dblin[i]=(double)in[i]; - - dspeca(dblin,rows,dblout); - - for (i=0;i<rows;i++) out[i]=(float)dblout[i]; -} diff --git a/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c b/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c deleted file mode 100644 index 25c88065..00000000 --- a/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void dspecaTest(void){ - double in[4]={1,1,1,3}; - double resultR[2]={0.5857864376269050765700,3.4142135623730949234300}; - - - double *out; - - int i; - - out=(double*)malloc((unsigned int)2*sizeof(double)); - - dspeca(in,2,out); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-resultR[i]) / fabs(out[i]) <3e-16); - else assert(1); - } - -} - - - - -static void zspecaTest(void){ - double inR[4]={1,1,1,3}; - double inI[4]={0,0,0,0}; - double resultR[2]={0.5857864376269050765700,3.4142135623730949234300}; - double resultI[2]={0,0}; - - double in2R[4]={1,1,-2,3}; - double in2I[4]={0,0,0,0}; - double result2R[2]={1.9999999999999997779554,1.9999999999999997779554}; - double result2I[2]={0.9999999999999997779554,-0.9999999999999997779554}; - - double in3R[16]={0.0603054538369178771973,0.631347181741148233414 ,0.0241030259057879447937,0.1527438252232968807221, - 0.9481177683919668197632,0.2744265575893223285675,0.4794727200642228126526,0.485576837789267301559, - 0.676400367170572280884,0.8321249918080866336823,0.0125875836238265037537,0.5453779897652566432953, - 0.8426716942340135574341,0.9029165101237595081329,0.4409482078626751899719,0.8332359003834426403046 }; - double in3I[16]={0.7233976423740386962891,0.4377150186337530612946,0.3080607382580637931824,0.8749813153408467769623, - 0.5355882328003644943237 ,0.3085998897440731525421,0.3354632416740059852600,0.2342486302368342876434, - 0.2589411698281764984131,0.8521509231068193912506,0.4821739485487341880798,0.6095217890106141567230, - 0.9872822705656290054321,0.9811426815576851367950,0.3303113700821995735169,0.3589145573787391185761}; - double result3R[4]={1.9486046375762748894545,0.2315060459861970343365,- 0.7694743345806510648188,- 0.2300808535483104266817}; - double result3I[4]={2.1242015857341254303492,- 0.4115101262891645017561,- 0.1980716835789462781925,0.3584662621795701720195}; - - doubleComplex *in,*in2,*in3,out[2],out2[4]; - - int i; - - in=DoubleComplexMatrix(inR,inI,4); - in2=DoubleComplexMatrix(in2R,in2I,4); - in3=DoubleComplexMatrix(in3R,in3I,16); - - zspeca(in,2,out); - for(i=0;i<2;i++){ - if (zreals(out[i])>1e-16) assert( fabs(zreals(out[i])-resultR[i]) / fabs(zreals(out[i])) <3e-16); - else assert(1); - if (zimags(out[i])>1e-16) assert( fabs(zimags(out[i])-resultI[i]) / fabs(zimags(out[i])) <1e-16); - else assert(1); - } - - - zspeca(in2,2,out); - for(i=0;i<2;i++){ - if (zreals(out[i])>1e-16) assert( fabs(zreals(out[i])-result2R[i]) / fabs(zreals(out[i])) <3e-16); - else assert(1); - if (zimags(out[i])>1e-16) assert( fabs(zimags(out[i])-result2I[i]) / fabs(zimags(out[i])) <3e-15); - else assert(1); - } - - - zspeca(in3,4,out2); - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-result3R[i]) / fabs(zreals(out2[i])) <3e-15); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-result3I[i]) / fabs(zimags(out2[i])) <3e-15); - else assert(1); - } - - -} - - -static int testSpec(void){ - printf(">>> Double Spec Tests <<<\n"); - printf(">>> Double <<<\n"); - dspecaTest(); - printf(">>> DoubleComplex <<<\n"); - zspecaTest(); - return 0; -} - - -int main(void){ - assert (testSpec()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c b/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c deleted file mode 100644 index 9bd46adc..00000000 --- a/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void sspecaTest(void){ - float in[4]={1.0f,1.0f,1.0f,3.0f}; - float resultR[2]={0.5857864376269050765700f,3.4142135623730949234300f}; - - float in1[4]={0.0f,4.0f,1.0f,0.0f}; - float result[2]={2.0f,-2.0f}; - - float in2[4]={1.0f,1.0f,-2.0f,3.0f}; - - float *out; - - int i; - - out=(float *)malloc((unsigned int)2*sizeof(float)); - - sspeca(in,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-resultR[i]) / fabs(out[i]) <1e-16); - else assert(1); - } - - - sspeca(in1,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-result[i]) / fabs(out[i]) <1e-16); - else assert(1); - } - - sspeca(in2,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - -} - - -static void cspecaTest(void){ - float inR[4]={1.0f,1.0f,1.0f,3.0f}; - float inI[4]={0.0f,0.0f,0.0f,0.0f}; - float resultR[2]={0.5857864376269050765700f,3.4142135623730949234300f}; - float resultI[2]={0,0}; - - float in2R[4]={1.0f,1.0f,-2.0f,3.0f}; - float in2I[4]={0.0f,0.0f,0.0f,0.0f}; - float result2R[2]={1.9999999999999997779554f,1.9999999999999997779554f}; - float result2I[2]={0.9999999999999997779554f,-0.9999999999999997779554f}; - - floatComplex *in,*in2,out[4]; - - int i; - - in=FloatComplexMatrix(inR,inI,4); - in2=FloatComplexMatrix(in2R,in2I,4); - - cspeca(in,2,out); - for(i=0;i<2;i++){ - if (creals(out[i])>1e-16) assert( fabs(creals(out[i])-resultR[i]) / fabs(creals(out[i])) <1e-15); - else assert(1); - if (cimags(out[i])>1e-16) assert( fabs(cimags(out[i])-resultI[i]) / fabs(cimags(out[i])) <1e-16); - else assert(1); - } - - - cspeca(in2,2,out); - for(i=0;i<2;i++){ - if (creals(out[i])>1e-16) assert( fabs(creals(out[i])-result2R[i]) / fabs(creals(out[i])) <1e-15); - else assert(1); - if (cimags(out[i])>1e-16) assert( fabs(cimags(out[i])-result2I[i]) / fabs(cimags(out[i])) <1e-15); - else assert(1); - } - -} - - - - -static int testSpec(void){ - printf(">>> Float Spec Tests <<<\n"); - printf(">>> Float <<<\n"); - sspecaTest(); - printf(">>> FloatComplex <<<\n"); - cspecaTest(); - return 0; -} - - -int main(void){ - assert (testSpec()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj b/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj deleted file mode 100644 index f696bff4..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{651B0E61-1047-4575-BE31-D9CB28062CBA}</ProjectGuid>
- <RootNamespace>testDoubleSpec</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters deleted file mode 100644 index dcdaea5c..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj b/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj deleted file mode 100644 index 0631bb40..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B7BEF8A2-3E42-4FA3-94A7-22618594057D}</ProjectGuid>
- <RootNamespace>testFloatSpec</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters deleted file mode 100644 index 2ba2e59f..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/zspeca.c b/2.3-1/src/c/matrixOperations/spec/zspeca.c deleted file mode 100644 index a2b1c25a..00000000 --- a/2.3-1/src/c/matrixOperations/spec/zspeca.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "conj.h" - -void zspeca(doubleComplex* in, int rows,doubleComplex* out){ - int i = 0, j = 0; - int hermitian = 0; - int INFO = 0; - int iWorkSize = 0; - doubleComplex* pdblWork; - doubleComplex* pdblLeftvectors; - doubleComplex* pdblRightvectors; - doubleComplex* pdblRWork; - double* outReal; - double* outImag; - doubleComplex* inCopy; - - inCopy = (doubleComplex*)malloc((unsigned int)(rows*rows) * sizeof(doubleComplex)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - iWorkSize = 2*rows; - pdblWork = (doubleComplex*)malloc((unsigned int)iWorkSize * sizeof(doubleComplex)); - pdblRWork = (doubleComplex*)malloc((unsigned int)(3*rows) * sizeof(doubleComplex)); - - for(i=0;i<rows*rows;i++) inCopy[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if ( (zreals(in[i*rows+j])!=zreals(zconjs(in[i+j*rows]))) || - (zimags(in[i*rows+j])!=zimags(zconjs(in[i+j*rows]))) ) - break; - if (j!=rows) break; - } - - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) hermitian=1; - - - /* apply lapack function according to symmetry */ - if(hermitian){ - C2F(zheev)( "N", "U", &rows, inCopy, &rows, outReal, pdblWork, &iWorkSize, outImag, &INFO ); - dzerosa(outImag,1,rows); - for (i=0;i<rows;i++) out[i]=DoubleComplex(outReal[i],outImag[i]); - } - else { - C2F(zgeev)( "N", "N", &rows, inCopy, &rows, out, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, - pdblRWork, &INFO ); - } - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblRWork); - free(pdblLeftvectors); - free(pdblRightvectors); -} diff --git a/2.3-1/src/c/matrixOperations/spec2/Makefile.am b/2.3-1/src/c/matrixOperations/spec2/Makefile.am deleted file mode 100644 index 5a357fa5..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libSpec2_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libSpec2.la - -HEAD = ../includes/spec.h - -libSpec2_la_SOURCES = $(HEAD) \ - sspec2a.c \ - dspec2a.c \ - cspec2a.c \ - zspec2a.c - - -############ -## CHECK -############ - - -check_PROGRAMS = testDoubleSpec2 testFloatSpec2 - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec2.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec2_SOURCES = testDoubleSpec2.c -testDoubleSpec2_LDADD = $(check_LDADD) -testDoubleSpec2_CFLAGS = $(check_INCLUDES) - -testFloatSpec2_SOURCES = testFloatSpec2.c -testFloatSpec2_LDADD = $(check_LDADD) -testFloatSpec2_CFLAGS = $(check_INCLUDES) - -TESTS = testDoubleSpec2 testFloatSpec2 - diff --git a/2.3-1/src/c/matrixOperations/spec2/Makefile.in b/2.3-1/src/c/matrixOperations/spec2/Makefile.in deleted file mode 100644 index 6e46c059..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/Makefile.in +++ /dev/null @@ -1,757 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT) -TESTS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT) -subdir = src/c/matrixOperations/spec2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libSpec2_la_LIBADD = -am__objects_1 = -am_libSpec2_la_OBJECTS = $(am__objects_1) libSpec2_la-sspec2a.lo \ - libSpec2_la-dspec2a.lo libSpec2_la-cspec2a.lo \ - libSpec2_la-zspec2a.lo -libSpec2_la_OBJECTS = $(am_libSpec2_la_OBJECTS) -libSpec2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libSpec2_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testDoubleSpec2_OBJECTS = \ - testDoubleSpec2-testDoubleSpec2.$(OBJEXT) -testDoubleSpec2_OBJECTS = $(am_testDoubleSpec2_OBJECTS) -testDoubleSpec2_DEPENDENCIES = $(check_LDADD) -testDoubleSpec2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSpec2_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testFloatSpec2_OBJECTS = testFloatSpec2-testFloatSpec2.$(OBJEXT) -testFloatSpec2_OBJECTS = $(am_testFloatSpec2_OBJECTS) -testFloatSpec2_DEPENDENCIES = $(check_LDADD) -testFloatSpec2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFloatSpec2_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libSpec2_la_SOURCES) $(testDoubleSpec2_SOURCES) \ - $(testFloatSpec2_SOURCES) -DIST_SOURCES = $(libSpec2_la_SOURCES) $(testDoubleSpec2_SOURCES) \ - $(testFloatSpec2_SOURCES) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libSpec2_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libSpec2.la -HEAD = ../includes/spec.h -libSpec2_la_SOURCES = $(HEAD) \ - sspec2a.c \ - dspec2a.c \ - cspec2a.c \ - zspec2a.c - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec2.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec2_SOURCES = testDoubleSpec2.c -testDoubleSpec2_LDADD = $(check_LDADD) -testDoubleSpec2_CFLAGS = $(check_INCLUDES) -testFloatSpec2_SOURCES = testFloatSpec2.c -testFloatSpec2_LDADD = $(check_LDADD) -testFloatSpec2_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/matrixOperations/spec2/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/c/matrixOperations/spec2/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libSpec2.la: $(libSpec2_la_OBJECTS) $(libSpec2_la_DEPENDENCIES) - $(libSpec2_la_LINK) -rpath $(pkglibdir) $(libSpec2_la_OBJECTS) $(libSpec2_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -testDoubleSpec2$(EXEEXT): $(testDoubleSpec2_OBJECTS) $(testDoubleSpec2_DEPENDENCIES) - @rm -f testDoubleSpec2$(EXEEXT) - $(testDoubleSpec2_LINK) $(testDoubleSpec2_OBJECTS) $(testDoubleSpec2_LDADD) $(LIBS) -testFloatSpec2$(EXEEXT): $(testFloatSpec2_OBJECTS) $(testFloatSpec2_DEPENDENCIES) - @rm -f testFloatSpec2$(EXEEXT) - $(testFloatSpec2_LINK) $(testFloatSpec2_OBJECTS) $(testFloatSpec2_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-cspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-dspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-sspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-zspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFloatSpec2-testFloatSpec2.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libSpec2_la-sspec2a.lo: sspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-sspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-sspec2a.Tpo -c -o libSpec2_la-sspec2a.lo `test -f 'sspec2a.c' || echo '$(srcdir)/'`sspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-sspec2a.Tpo $(DEPDIR)/libSpec2_la-sspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sspec2a.c' object='libSpec2_la-sspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-sspec2a.lo `test -f 'sspec2a.c' || echo '$(srcdir)/'`sspec2a.c - -libSpec2_la-dspec2a.lo: dspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-dspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-dspec2a.Tpo -c -o libSpec2_la-dspec2a.lo `test -f 'dspec2a.c' || echo '$(srcdir)/'`dspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-dspec2a.Tpo $(DEPDIR)/libSpec2_la-dspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspec2a.c' object='libSpec2_la-dspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-dspec2a.lo `test -f 'dspec2a.c' || echo '$(srcdir)/'`dspec2a.c - -libSpec2_la-cspec2a.lo: cspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-cspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-cspec2a.Tpo -c -o libSpec2_la-cspec2a.lo `test -f 'cspec2a.c' || echo '$(srcdir)/'`cspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-cspec2a.Tpo $(DEPDIR)/libSpec2_la-cspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cspec2a.c' object='libSpec2_la-cspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-cspec2a.lo `test -f 'cspec2a.c' || echo '$(srcdir)/'`cspec2a.c - -libSpec2_la-zspec2a.lo: zspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-zspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-zspec2a.Tpo -c -o libSpec2_la-zspec2a.lo `test -f 'zspec2a.c' || echo '$(srcdir)/'`zspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-zspec2a.Tpo $(DEPDIR)/libSpec2_la-zspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zspec2a.c' object='libSpec2_la-zspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-zspec2a.lo `test -f 'zspec2a.c' || echo '$(srcdir)/'`zspec2a.c - -testDoubleSpec2-testDoubleSpec2.o: testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -MT testDoubleSpec2-testDoubleSpec2.o -MD -MP -MF $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo -c -o testDoubleSpec2-testDoubleSpec2.o `test -f 'testDoubleSpec2.c' || echo '$(srcdir)/'`testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec2.c' object='testDoubleSpec2-testDoubleSpec2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -c -o testDoubleSpec2-testDoubleSpec2.o `test -f 'testDoubleSpec2.c' || echo '$(srcdir)/'`testDoubleSpec2.c - -testDoubleSpec2-testDoubleSpec2.obj: testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -MT testDoubleSpec2-testDoubleSpec2.obj -MD -MP -MF $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo -c -o testDoubleSpec2-testDoubleSpec2.obj `if test -f 'testDoubleSpec2.c'; then $(CYGPATH_W) 'testDoubleSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec2.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec2.c' object='testDoubleSpec2-testDoubleSpec2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -c -o testDoubleSpec2-testDoubleSpec2.obj `if test -f 'testDoubleSpec2.c'; then $(CYGPATH_W) 'testDoubleSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec2.c'; fi` - -testFloatSpec2-testFloatSpec2.o: testFloatSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -MT testFloatSpec2-testFloatSpec2.o -MD -MP -MF $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo -c -o testFloatSpec2-testFloatSpec2.o `test -f 'testFloatSpec2.c' || echo '$(srcdir)/'`testFloatSpec2.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo $(DEPDIR)/testFloatSpec2-testFloatSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec2.c' object='testFloatSpec2-testFloatSpec2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -c -o testFloatSpec2-testFloatSpec2.o `test -f 'testFloatSpec2.c' || echo '$(srcdir)/'`testFloatSpec2.c - -testFloatSpec2-testFloatSpec2.obj: testFloatSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -MT testFloatSpec2-testFloatSpec2.obj -MD -MP -MF $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo -c -o testFloatSpec2-testFloatSpec2.obj `if test -f 'testFloatSpec2.c'; then $(CYGPATH_W) 'testFloatSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec2.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo $(DEPDIR)/testFloatSpec2-testFloatSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec2.c' object='testFloatSpec2-testFloatSpec2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -c -o testFloatSpec2-testFloatSpec2.obj `if test -f 'testFloatSpec2.c'; then $(CYGPATH_W) 'testFloatSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec2.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/2.3-1/src/c/matrixOperations/spec2/cspec2a.c b/2.3-1/src/c/matrixOperations/spec2/cspec2a.c deleted file mode 100644 index d3a4312f..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/cspec2a.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void cspec2a(floatComplex* in, int rows, floatComplex* eigenvalues,floatComplex* eigenvectors){ - /* As we use Lapack to find the eigenvalues, we must cast the floatComplex input into doubleComplex - and the doubleComplex outputs of dspeca into floatComplex*/ - - int i; - doubleComplex* dblin; - doubleComplex* dbleigenvalues,*dbleigenvectors; - - dblin=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dbleigenvalues=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dbleigenvectors=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - - for (i=0;i<rows*rows;i++) dblin[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i])); - - zspec2a(dblin,rows,dbleigenvalues,dbleigenvectors); - - for (i=0;i<rows*rows;i++) eigenvalues[i]=FloatComplex((float)zreals(dbleigenvalues[i]),(float)zimags(dbleigenvalues[i])); - for (i=0;i<rows*rows;i++) eigenvectors[i]=FloatComplex((float)zreals(dbleigenvectors[i]),(float)zimags(dbleigenvectors[i])); -} diff --git a/2.3-1/src/c/matrixOperations/spec2/dspec2a.c b/2.3-1/src/c/matrixOperations/spec2/dspec2a.c deleted file mode 100644 index 98b2c5ad..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/dspec2a.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "max.h" - -void dspec2a(double* in, int rows,double* eigenvalues,double* eigenvectors){ - int i=0, j=0, ij=0, ij1=0; - int symmetric=0; - int INFO=0; - int iWorkSize = 0; - double* pdblWork; - double* outReal; - double* outImag; - double* pdblLeftvectors; - double* pdblRightvectors; - double* inCopy; - - /* FIXME : malloc here */ - inCopy = (double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = NULL; - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - - iWorkSize = 4*rows; - pdblWork = (double*)malloc((unsigned int)iWorkSize * sizeof(double)); - - for(i=0;i<rows*rows;i++) inCopy[i]=in[i]; - - - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if (in[i*rows+j]!=in[i+j*rows]) break; - if (j!=rows) break; - - } - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) symmetric=1; - - /* apply lapack function according to symmetry */ - if(symmetric){ - C2F(dsyev)( "V", "U", &rows, inCopy, &rows, outReal, pdblWork, &iWorkSize, &INFO ); - - /* Computation of eigenvectors */ - for (i=0;i<rows*rows;i++) eigenvectors[i] = inCopy[i]; - } - else { - pdblRightvectors=(double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - C2F(dgeev)( "N", "V", &rows, inCopy, &rows, outReal, outImag, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, &INFO ); - - /* Computation of eigenvectors */ - j=0; - while (j<rows) - { - if (outImag[j]==0) - { - for(i = 0 ; i < rows ; i++) - { - ij = i + j * rows; - eigenvectors[ij] = pdblRightvectors[ij]; - } - j = j + 1; - } - else - { - for(i = 0 ; i < rows ; i++) - { - ij = i + j * rows; - ij1 = i + (j + 1) * rows; - eigenvectors[ij] = pdblRightvectors[ij]; - eigenvectors[ij1] = pdblRightvectors[ij]; - } - j = j + 2; - } - } - } - - /* Computation of eigenvalues */ - dzerosa(eigenvalues,1,rows*rows); - for (i=0;i<rows;i++) eigenvalues[i+i*rows]=outReal[i]; - - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblLeftvectors); - free(pdblRightvectors); - free(pdblWork); - -} - diff --git a/2.3-1/src/c/matrixOperations/spec2/sspec2a.c b/2.3-1/src/c/matrixOperations/spec2/sspec2a.c deleted file mode 100644 index d3ab00d5..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/sspec2a.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void sspec2a(float* in, int rows, float* eigenvalues,float* eigenvectors){ - /* As we use Lapack to find the eigenvalues, we must cast the float input into double - and the doubleComplex outputs of dspec2a into floatComplex*/ - - int i; - double* dblin; - double *dbleigenvalues,*dbleigenvectors; - - dblin=(double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dbleigenvalues = (double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dbleigenvectors = (double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - - for (i=0;i<rows*rows;i++) dblin[i]=(double)in[i]; - - dspec2a(dblin,rows,dbleigenvalues,dbleigenvectors); - - for (i=0;i<rows*rows;i++) eigenvalues[i]=(float)dbleigenvalues[i]; - for (i=0;i<rows*rows;i++) eigenvectors[i]=(float)dbleigenvectors[i]; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c b/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c deleted file mode 100644 index a090f028..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - - -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void dspec2aTest(void){ - double in[4]={1,1,1,3}; - double resultValuesR[4]={0.5857864376269050765700,0,0,3.4142135623730949234300}; - double resultVectorsR[4]={- 0.9238795325112867384831,0.3826834323650897817792, - 0.3826834323650897817792,0.9238795325112867384831}; - - - double in2[4]={1,1,-2,3}; - double resultValues2R[4]={1.9999999999999997779554,0,0,1.9999999999999997779554}; - double resultVectors2R[4]={0.8164965809277261454824,- 0.4082482904638631282523, - 0.8164965809277261454824,- 0.4082482904638631282523}; - - double in3[9]={0,-1,0,1,0,0,0,0,0}; - double resultValues3R[9]={0}; - double resultVectors3R[9]={0.7071067811865474617150,0,0,0.7071067811865474617150,0,0,0,0,1}; - - - double out1[4],out2[4],out3[9],out4[9]; - - int i; - dspec2a(in3,3,out3,out4); - for(i=0;i<9;i++){ - if (out3[i]>1e-16) assert( fabs(out3[i]-resultValues3R[i]) / fabs(out3[i]) <3e-16); - else assert(1); - } - for(i=0;i<9;i++){ - if (out4[i]>1e-16) assert( fabs(out4[i]-resultVectors3R[i]) / fabs(out4[i]) <3e-16); - else assert(1); - } - - - dspec2a(in,2,out1,out2); - for(i=0;i<4;i++) printf("%f\n",out1[i]); - for(i=0;i<4;i++){ - if (out1[i]>1e-16) assert( fabs(out1[i]-resultValuesR[i]) / fabs(out1[i]) <3e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (out2[i]>1e-16) assert( fabs(out2[i]-resultVectorsR[i]) / fabs(out2[i]) <3e-16); - else assert(1); - } - - - dspec2a(in2,2,out1,out2); - - for(i=0;i<4;i++){ - if (out1[i]>1e-16) assert( fabs(out1[i]-resultValues2R[i]) / fabs(out1[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (out2[i]>1e-16) assert( fabs(out2[i]-resultVectors2R[i]) / fabs(out2[i]) <3e-16); - else assert(1); - } - -} - - - - -static void zspec2aTest(void){ - double inR[4]={1,1,1,3}; - double inI[4]={0,0,0,0}; - double resultValuesR[4]={0.5857864376269050765700,0,0,3.4142135623730949234300}; - double resultValuesI[4]={0,0,0,0}; - double resultVectorsR[4]={- 0.9238795325112867384831,0.3826834323650897817792, - 0.3826834323650897817792,0.9238795325112867384831}; - double resultVectorsI[4]={0,0,0,0}; - - double in2R[4]={1,1,-2,3}; - double in2I[4]={0,0,0,0}; - double resultValues2R[4]={1.9999999999999997779554,0,0,1.9999999999999997779554}; - double resultValues2I[4]={0.9999999999999997779554,0,0,-0.9999999999999997779554}; - double resultVectors2R[4]={0.8164965809277261454824,- 0.4082482904638631282523, - 0.8164965809277261454824,- 0.4082482904638631282523}; - double resultVectors2I[4]={0,- 0.4082482904638629062077,0,0.4082482904638629062077}; - - - double in3R[16]={ 0.4685934986919164657593, 0.4262020816095173358917, 0.4217656338587403297424, 0.1034853602759540081024 , - 0.4279759414494037628174, 0.7860729382373392581940, 0.8568082069978117942810, 0.1993437460623681545258 , - 0.7131301630288362503052, 0.5208952468819916248322, 0.9311723159626126289368, 0.4143836158327758312225, - 0.5980196148157119750977, 0.5549105503596365451813, 0.8552952585741877555847, 0.3097750707529485225678}; - double in3I[16]={0.9446128141134977340698, 0.2442680452950298786163, 0.8760446915403008460999, 0.4874215493910014629364, - 0.3844018988311290740967, 0.0922345430590212345123, 0.0705418726429343223572, 0.7338807261548936367035, - 0.7792180571705102920532, 0.7827638057060539722443, 0.2161567779257893562317, 0.3420197847299277782440, - 0.430093832314014434814 , 0.6261752569116652011871, 0.9554250938817858695984, 0.45415506651625037193 }; - double resultValues3R[16]={2.0556597713281337114211 , 0. , 0. , 0. , - 0. , - 0.3025728286579054682193 , 0. , 0. , - 0. , 0. , 0.1432776981289703988054 , 0. , - 0. , 0. , 0. , 0.59924918284561956571821}; - double resultValues3I[16]={2.0772175543447914947137 , 0. , 0. , 0. , - 0. , - 0.5223086999196728807959 , 0. , 0. , - 0. , 0. , 0.3871735516160564882782 , 0. , - 0. , 0. , 0. , - 0.2349232044266161556489 }; - double resultVectors3R[16]={ 0.5762578366606958546470 , 0.4529873647084416976583 , 0.5438116534400605495137 , 0.3599855200589946457868 , - - 0.3285074902800487195442, - 0.0923654569732548225147, 0.6473744750124794666846, - 0.1812302216765642182139 , - 0.7395301236826927748780, - 0.4588526195219964631811, 0.0997916953568371567496, - 0.3603263850824164338249 , - 0.0717862182160008133192, 0.6967198304315765922112, - 0.1153149977500917411355 , - 0.3232658081022470875077 }; - double resultVectors3I[16]={ 0. , - 0.1082260232744242933745, - 0.1403164362264210929254 , 0.0775054168635924967123 , - 0.0347047096401541868560, - 0.4780157518240965019984, 0. , 0.4493438228998393735303, - 0. , - 0.0484367977162360741072 , 0.0664282497469102783949 , - 0.3098340648435350952461 , - 0.1768623397230159322024, 0. , - 0.4621680558325051979551 , 0.3830799998945915163517}; - - - double in4R[49]={0.0292230211198329925537, 0.1069206790998578071594, 9.7463708464056253433228, 7.7042609406635165214539 , 6.3966313377022743225098, 9.5358861843124032020569, 4.1484833415597677230835, - 4.6615396952256560325623, 2.2384551353752613067627, 3.4569733263924717903137, 2.3406236339360475540161, 6.6193414805456995964050,2.6911795139312744140625,9.8302489006891846656799 , - 7.3933512251824140548706, 2.9021358629688620567322 , 3.9959496073424816131592 , 9.792278115637600421906 , 0.0755135808140039443970, 7.0210226578637957572937 , 8.9075061306357383728027 , - 6.5269742021337151527405 , 4.136228552088141441345 , 8.5816909139975905418396 , 2.3960896767675876617432 , 4.8200417729094624519348, 9.848585547879338264465 , 4.4697216479107737541199, - 2.3298137634992599487305, 2.2345139319077134132385, 8.0025654565542936325073, 7.7507343282923102378845, 4.8250066302716732025146, 7.8448831336572766304016 , 1.5346793178468942642212 , - 7.7228771103546023368835 , 8.9520217850804328918457, 9.4673257926478981971741, 6.9818257447332143783569, 9.5591608202084898948669, 0.4840173013508319854736, 5.3235206427052617073059, - 2.9468670953065156936646, 6.9771366892382502555847 , 9.3762038648128509521484 , 1.0755608463659882545471 , 7.7634243946522474288940, 6.3734178384765982627869 , 0.6630615703761577606201 }; - double in4I[49]={8.1694598542526364326477, 3.5473910067230463027954, 5.860544512979686260223, 3.4610254690051078796387, 4.4247510144487023353577, 8.8226650562137365341187, 7.6436930662021040916443 , - 7.764139864593744277954, 2.8076809318736195564270, 6.9086006004363298416138, 7.1747286943718791007996, 3.7201813608407974243164 , 9.3254965776577591896057, 2.2566775511950254440308, - 7.5211019208654761314392 , 3.0747506581246852874756 , 5.9793261485174298286438, 1.9238903466612100601196, 2.3870888305827975273132 , 7.4708331003785133361816, 9.7131536761298775672913, - 4.3703553732484579086304, 6.2248750543221831321716, 3.2913279719650745391846, 3.2963873865082859992981, 2.7686371374875307083130 , 4.8729835031554102897644, 7.7320465445518493652344 , - 9.0775218093767762184143, 5.0122931879013776779175, 5.1595458528026938438416, 5.79267887398600578308 , 1.5463936375454068183899 , 7.6111377868801355361938, 6.9079177780076861381531 , - 2.8732293471693992614746, 9.64253133628517389297 , 5.6607243325561285018921, 5.7821379369124770164490, 2.6634209789335727691650 , 4.7470985027030110359192, 6.0735465306788682937622, - 0.4097307054325938224793, 5.0125684589147567749023 , 5.2959309751167893409729, 6.2594583164900541305542, 2.2193526616320013999939 , 3.467419948428869247437, 3.9511676924303174018860 }; - double resultValues4R[49]={39.018457752476393807228 ,0,0,0,0,0,0, - 0,2.2455352415739073812517,0,0,0,0,0, - 0,0,- 8.4848591657394489828903,0,0,0,0, - 0,0,0,- 9.617033196016185669919,0,0,0, - 0,0,0,0,- 3.7815852014367528077798,0,0, - 0,0,0,0,0,- 4.44858427601393291440,0, - 0,0,0,0,0,0,- 0.3001282122401837670900}; - double resultValues4I[49]={36.525725390582877594170,0,0,0,0,0,0, - 0,- 5.9058762755733944516123,0,0,0,0,0, - 0,0,- 3.5959527108686115681735,0,0,0,0, - 0,0,0,1.8928051444081777088257,0,0,0, - 0,0,0,0,- 3.1889864758923365251064,0,0, - 0,0,0,0,0,3.2418188738592150777151,0, - 0,0,0,0,0,0,1.5279802073147508156836}; - - double resultVectors4R[49]={ 0.3499995148567048852684, 0.3131141942665225941234, 0.4518966551544936205431, 0.3429358568207974133912, 0.3073919828504245721490, 0.4236868694783915145763, 0.3928739146959387973368 , - 0.2654822689469810148566 , - 0.3607918093136298631762, 0.0473515544359270068586 , 0.5097969509656486986060 , -0.3771134435310480315096 , 0.2011534205484152293408, - 0.4415200724898113993078, - 0.5454886553461798515130, - 0.2173248800239625522224, - 0.2171708216301463378883 , - 0.2460117034233289534662 , -0.3694743444265859433351 , 0.3601018742104445391483, 0.1530612374027510713681, - 0.6385835932752577104310, - 0.0013906755423099548263, - 0.3368505708673739662551 , 0.1394203608831885433 , -0.2292783363046769218308 , -0.2740379414191142504187, 0.1926279946047058377889 , - - 0.6106238336849327819067, 0.0128604884735820379493, 0.2248434453925002574071, - 0.0955950290268089419854 , 0.6322383898844411431739 , - 0.1362122761803175874373, - 0.0030545591332723984190, - 0.5431360047322275619308, 0.1304324282476526930541, - 0.3713242513274904177401, - 0.2693820083406764376299 , - 0.1431429883314006001882 , 0.0533021313694299267438, 0.0071247423818797811501 , - - 0.156705245229635081738, 0.0034676864415526253982 , - 0.3351413975178426096768 , 0.2927797449896782921996 , 0.5714932440406852443005 , 0.0738366305178744797288, - 0.4509415569247051669422 }; - double resultVectors4I[49]={ 0.0720991445669864616796 , 0.0844739028302603361942 , 0. , 0.0173431366502564965337, -0.0428710162141596462515, 0.0695226101295536302871, 0.0999385617869267273150, - 0.2510960793336660668018 , - 0.1123901435582568414384, 0.0091069807153507792430, 0. , - 0.2545493692188907641771, 0.1149714203529902251111, 0.0762796210842419941667, - 0. , 0.0611827470444509316505, 0.2295643426501567385678, - 0.2950878328821502361024, 0.198556748820033573955, 0.0646801132828138114483, - 0.2660572521172601678785, - 0. , 0.2688905463703794573860, 0.2230635356255223633593 , - 0.2013432448241845862391, - 0.0386922946770884290668, 0.0358963301038670995480, - 0.3593711366897305303780 , - - 0.1386717901043315326337, 0.0600994116374372472356, - 0.1167558596038882207102 , 0.317965599565130263571, 0. , -0.0642522754144960878131, - 0.0853665514099945371695, - 0. , 0.2715431731544318272320, - 0.1184277560110737481658 , 0.3655618467608299226868, - 0.4598766797780974302512 , 0.0188698345957667955319, - 0.1446429340244405892246, - 0.346095581161616094867 , 0.0750882555805542639682, - 0.2494867985551498246188, - 0.2328934592128872882455, 0. , -0.0047307828167728396829, - 0.0078254955461786041004}; - - - - - doubleComplex *in,*in2,*in3,*in4,out1[4],out2[4],out3[16],out4[16],out5[49],out6[49]; - - int i; - - in=DoubleComplexMatrix(inR,inI,4); - in2=DoubleComplexMatrix(in2R,in2I,4); - in3=DoubleComplexMatrix(in3R,in3I,16); - in4=DoubleComplexMatrix(in4R,in4I,49); - zspec2a(in,2,out1,out2); - - - for(i=0;i<4;i++){ - if (zreals(out1[i])>1e-16) assert( fabs(zreals(out1[i])-resultValuesR[i]) / fabs(zreals(out1[i])) <3e-16); - else assert(1); - if (zimags(out1[i])>1e-16) assert( fabs(zimags(out1[i])-resultValuesI[i]) / fabs(zimags(out1[i])) <1e-16); - else assert(1); - } - - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-resultVectorsR[i]) / fabs(zreals(out2[i])) <3e-16); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-resultVectorsI[i]) / fabs(zimags(out2[i])) <1e-16); - else assert(1); - } - - - zspec2a(in2,2,out1,out2); - for(i=0;i<4;i++){ - if (zreals(out1[i])>1e-16) assert( fabs(zreals(out1[i])-resultValues2R[i]) / fabs(zreals(out1[i])) <3e-16); - else assert(1); - if (zimags(out1[i])>1e-16) assert( fabs(zimags(out1[i])-resultValues2I[i]) / fabs(zimags(out1[i])) <3e-15); - else assert(1); - } - - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-resultVectors2R[i]) / fabs(zreals(out2[i])) <3e-16); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-resultVectors2I[i]) / fabs(zimags(out2[i])) <3e-15); - else assert(1); - } - - - - zspec2a(in3,4,out3,out4); - for(i=0;i<16;i++){ - if (zreals(out3[i])>1e-16) assert( fabs(zreals(out3[i])-resultValues3R[i]) / fabs(zreals(out3[i])) <3e-15); - else assert(1); - if (zimags(out3[i])>1e-16) assert( fabs(zimags(out3[i])-resultValues3I[i]) / fabs(zimags(out3[i])) <3e-15); - else assert(1); - } - for(i=0;i<16;i++){ - if (zreals(out4[i])>1e-16) assert( fabs(zreals(out4[i])-resultVectors3R[i]) / fabs(zreals(out4[i])) <3e-15); - else assert(1); - if (zimags(out4[i])>1e-16) assert( fabs(zimags(out4[i])-resultVectors3I[i]) / fabs(zimags(out4[i])) <3e-14); - else assert(1); - } - - /* FIXME : assert : 3e-16 maybe du to little values like 0.001... */ - zspec2a(in4,7,out5,out6); - - for(i=0;i<49;i++){ - if (zreals(out5[i])>1e-16) assert( fabs(zreals(out5[i])-resultValues4R[i]) / fabs(zreals(out5[i])) <3e-15); - else assert(1); - if (zimags(out5[i])>1e-16) assert( fabs(zimags(out5[i])-resultValues4I[i]) / fabs(zimags(out5[i])) <3e-14); - else assert(1); - } - for(i=0;i<49;i++){ - if (zreals(out6[i])>1e-16) assert( fabs(zreals(out6[i])-resultVectors4R[i]) / fabs(zreals(out6[i])) <3e-14); - else assert(1); - if (zimags(out6[i])>1e-16) assert( fabs(zimags(out6[i])-resultVectors4I[i]) / fabs(zimags(out6[i])) <3e-13); - else assert(1); - } - - - -} - - -static int testSpec2(void){ - printf(">>> Double Spec2 Tests <<<\n"); - printf(">>> Double <<<\n"); - dspec2aTest(); - printf(">>> DoubleComplex <<<\n"); - zspec2aTest(); - return 0; -} - - -int main(void){ - assert (testSpec2()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c b/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c deleted file mode 100644 index fb2bc255..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - - -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void sspec2aTest(void){ - float in[4]={1.0f,1.0f,1.0f,3.0f}; - float resultValuesR[4]={0.5857864376269050765700f,0,0,3.4142135623730949234300f}; - float resultVectorsR[4]={- 0.9238795325112867384831f,0.3826834323650897817792f, - 0.3826834323650897817792f,0.9238795325112867384831f}; - - float in2[4]={1.0f,1.0f,-2.0f,3.0f}; - float resultValues2R[4]={1.9999999999999997779554f,0,0,1.9999999999999997779554f}; - float resultVectors2R[4]={0.8164965809277261454824f,- 0.4082482904638631282523f, - 0.8164965809277261454824f,- 0.4082482904638631282523f}; - float eigenvalues[4],eigenvectors[4]; - - int i; - - sspec2a(in,2,eigenvalues,eigenvectors); - - for(i=0;i<4;i++){ - if (eigenvalues[i]>1e-6) assert( fabs(eigenvalues[i]-resultValuesR[i]) / fabs(eigenvalues[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (eigenvectors[i]>1e-6) assert( fabs(eigenvectors[i]-resultVectorsR[i]) / fabs(eigenvectors[i]) <1e-16); - else assert(1); - } - - - sspec2a(in2,2,eigenvalues,eigenvectors); - - - - for(i=0;i<4;i++){ - if (eigenvalues[i]>1e-6) assert( fabs(eigenvalues[i]-resultValues2R[i]) / fabs(eigenvalues[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (eigenvectors[i]>1e-6) assert( fabs(eigenvectors[i]-resultVectors2R[i]) / fabs(eigenvectors[i]) <1e-16); - else assert(1); - } -} - - - - -static void cspec2aTest(void){ - float inR[4]={1.0f,1.0f,1.0f,3.0f}; - float inI[4]={0.0f,0.0f,0.0f,0.0f}; - float resultValuesR[4]={0.5857864376269050765700f,0,0,3.4142135623730949234300f}; - float resultValuesI[4]={0,0,0,0}; - float resultVectorsR[4]={- 0.9238795325112867384831f,0.3826834323650897817792f, - 0.3826834323650897817792f,0.9238795325112867384831f}; - float resultVectorsI[4]={0,0,0,0}; - - float in2R[4]={1.0f,1.0f,-2.0f,3.0f}; - float in2I[4]={0.0f,0.0f,0.0f,0.0f}; - float resultValues2R[4]={1.9999999999999997779554f,0,0,1.9999999999999997779554f}; - float resultValues2I[4]={0.9999999999999997779554f,0,0,-0.9999999999999997779554f}; - float resultVectors2R[4]={0.8164965809277261454824f,- 0.4082482904638631282523f, - 0.8164965809277261454824f,- 0.4082482904638631282523f}; - float resultVectors2I[4]={0,- 0.4082482904638629062077f,0,0.4082482904638629062077f}; - - floatComplex *in,*in2,out1[4],out2[4]; - - int i; - - in=FloatComplexMatrix(inR,inI,4); - in2=FloatComplexMatrix(in2R,in2I,4); - - cspec2a(in,2,out1,out2); - for(i=0;i<4;i++){ - if (creals(out1[i])>1e-16) assert( fabs(creals(out1[i])-resultValuesR[i]) / fabs(creals(out1[i])) <1e-15); - else assert(1); - if (cimags(out1[i])>1e-16) assert( fabs(cimags(out1[i])-resultValuesI[i]) / fabs(cimags(out1[i])) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (creals(out2[i])>1e-16) assert( fabs(creals(out2[i])-resultVectorsR[i]) / fabs(creals(out2[i])) <1e-15); - else assert(1); - if (cimags(out2[i])>1e-16) assert( fabs(cimags(out2[i])-resultVectorsI[i]) / fabs(cimags(out2[i])) <1e-16); - else assert(1); - } - - - cspec2a(in2,2,out1,out2); - for(i=0;i<4;i++){ - if (creals(out1[i])>1e-16) assert( fabs(creals(out1[i])-resultValues2R[i]) / fabs(creals(out1[i])) <1e-15); - else assert(1); - if (cimags(out1[i])>1e-16) assert( fabs(cimags(out1[i])-resultValues2I[i]) / fabs(cimags(out1[i])) <1e-15); - else assert(1); - } - for(i=0;i<4;i++){ - if (creals(out2[i])>1e-16) assert( fabs(creals(out2[i])-resultVectors2R[i]) / fabs(creals(out2[i])) <1e-15); - else assert(1); - if (cimags(out2[i])>1e-16) assert( fabs(cimags(out2[i])-resultVectors2I[i]) / fabs(cimags(out2[i])) <1e-16); - else assert(1); - } -} - - - - -static int testSpec2(void){ - printf(">>> Float Spec2 Tests <<<\n"); - printf(">>> Float <<<\n"); - sspec2aTest(); - printf(">>> FloatComplex <<<\n"); - cspec2aTest(); - return 0; -} - - -int main(void){ - assert (testSpec2()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj b/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj deleted file mode 100644 index 7c36943b..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{FD0A4495-C372-41EF-B8EF-0A0939DA6C1E}</ProjectGuid>
- <RootNamespace>testDoubleSpec2</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec2.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters deleted file mode 100644 index 04f409dc..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj b/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj deleted file mode 100644 index f4154eb1..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E20D0BC2-B28A-412C-9715-5B93B319A4A3}</ProjectGuid>
- <RootNamespace>testFloatSpec2</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec2.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters deleted file mode 100644 index 0c38d2f2..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/zspec2a.c b/2.3-1/src/c/matrixOperations/spec2/zspec2a.c deleted file mode 100644 index e33ed897..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/zspec2a.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "stdio.h" -#include "conj.h" - -void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues, doubleComplex* eigenvectors){ - int i = 0, j = 0; - int hermitian = 0; - int INFO = 0; - int iWorkSize = 0; - doubleComplex* pdblWork; - doubleComplex* pdblLeftvectors; - doubleComplex* pdblRightvectors; - doubleComplex* pdblRWork; - double* pdblRWork2; - double* outReal; - double* outImag; - doubleComplex* inCopy; - - inCopy = (doubleComplex*)malloc((unsigned int)(rows*rows) * sizeof(doubleComplex)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - iWorkSize = 2*rows; - pdblWork = (doubleComplex*)malloc((unsigned int)iWorkSize * sizeof(doubleComplex)); - pdblRWork = NULL; - pdblRWork2 = NULL; - - for(i=0;i<rows*rows;i++) { - inCopy[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - eigenvectors[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - } - zzerosa(eigenvalues,1,rows*rows); - - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if ( (zreals(in[i*rows+j])!=zreals(zconjs(in[i+j*rows]))) || - (zimags(in[i*rows+j])!=zimags(zconjs(in[i+j*rows]))) ) - break; - if (j!=rows) break; - } - - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) hermitian=1; - - - /* apply lapack function according to symmetry */ - if(hermitian){ - pdblRWork2 = (double*)malloc((unsigned int)(3*rows) * sizeof(double)); - C2F(zheev)( "V", "U", &rows, eigenvectors, &rows, outReal, pdblWork, &iWorkSize, pdblRWork2, &INFO ); - dzerosa(outImag,1,rows); - for (i=0;i<rows;i++) eigenvalues[i+i*rows]=DoubleComplex(outReal[i],outImag[i]); - } - else { - pdblRWork = (doubleComplex*)malloc((unsigned int)(3*rows) * sizeof(doubleComplex)); - C2F(zgeev)( "N", "V", &rows, inCopy, &rows, eigenvalues, - pdblLeftvectors, &rows, eigenvectors, &rows, pdblWork, &iWorkSize, - pdblRWork, &INFO ); - for (i=1;i<rows;i++) { - eigenvalues[i+i*rows]=DoubleComplex(zreals(eigenvalues[i]),zimags(eigenvalues[i])); - eigenvalues[i]=DoubleComplex(0,0); - } - } - - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblRWork); - free(pdblRWork2); - free(pdblLeftvectors); - free(pdblRightvectors); -} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c new file mode 100644 index 00000000..56c3ef84 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c @@ -0,0 +1,36 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "floatComplex.h" +#include "stdlib.h" +#include "string.h" +#include "cat.h" + +/*Function to build a Toeplitz Matrix for inputs of SingleComplex datatype*/ + +void ctoeplitza(floatComplex* inp1,int size1,floatComplex* inp2,int size2,floatComplex* oup) +{ + if ((creals(inp1[0])!=creals(inp2[0]))&&(cimags(inp1[0])!=cimags(inp2[0]))) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = FloatComplex(0,0); // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (creals(oup[i]) == 0 && cimags(oup[i]) == 0) + oup[i] = oup[i-size2-1]; + } +} + + diff --git a/2.3-1/src/c/matrixOperations/toeplitz/dtoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/dtoeplitza.c new file mode 100644 index 00000000..ef075a9a --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/dtoeplitza.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include "toeplitz.h" + + +/*Function to build a Toeplitz Matrix for inputs of Double datatype*/ + + +void dtoeplitza(double* inp1,int size1,double* inp2,int size2,double* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} + diff --git a/2.3-1/src/c/matrixOperations/toeplitz/gtoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/gtoeplitza.c new file mode 100644 index 00000000..c852f92f --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/gtoeplitza.c @@ -0,0 +1,35 @@ +#include <stdio.h> +#include "toeplitz.h" + + +/*Function to build a Toeplitz Matrix for inputs of Character datatype*/ + + +void gtoeplitza(char* inp1,int size1,char* inp2,int size2,char* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } + +} + + diff --git a/2.3-1/src/c/matrixOperations/toeplitz/i16toeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/i16toeplitza.c new file mode 100644 index 00000000..945f626e --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/i16toeplitza.c @@ -0,0 +1,32 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "int16.h" + +/*Function to build a Toeplitz Matrix for inputs of Signed Int16 datatype*/ + + +void i16toeplitza(int16* inp1,int size1,int16* inp2,int size2,int16* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/i8toeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/i8toeplitza.c new file mode 100644 index 00000000..5075cc13 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/i8toeplitza.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "int8.h" + + +/*Function to build a Toeplitz Matrix for inputs of Signed Int8 datatype*/ + + +void i8toeplitza(int8* inp1,int size1,int8* inp2,int size2,int8* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/stoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/stoeplitza.c new file mode 100644 index 00000000..11d91ce1 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/stoeplitza.c @@ -0,0 +1,32 @@ +#include <stdio.h> +#include "toeplitz.h" + + +/*Function to build a Toeplitz Matrix for inputs of Float datatype*/ + + +void stoeplitza(float* inp1,int size1,float* inp2,int size2,float* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/u16toeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/u16toeplitza.c new file mode 100644 index 00000000..8dab5452 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/u16toeplitza.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "uint16.h" + + +/*Function to build a Toeplitz Matrix for inputs of Unsigned Int16 datatype*/ + + +void u16toeplitza(uint16* inp1,int size1,uint16* inp2,int size2,uint16* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/u8toeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/u8toeplitza.c new file mode 100644 index 00000000..8301fc16 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/u8toeplitza.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "uint8.h" + + +/*Function to build a Toeplitz Matrix for inputs of Unsigned Int8 datatype*/ + + +void u8toeplitza(uint8* inp1,int size1,uint8* inp2,int size2,uint8* oup) +{ + if (inp1[0]!=inp2[0]) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (oup[i] == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c new file mode 100644 index 00000000..117f8189 --- /dev/null +++ b/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c @@ -0,0 +1,36 @@ +#include <stdio.h> +#include "toeplitz.h" +#include "doubleComplex.h" +#include "stdlib.h" +#include "string.h" +#include "cat.h" + + +/*Function to build a Toeplitz Matrix for inputs of DoubleComplex datatype*/ + + +void ztoeplitza(doubleComplex* inp1,int size1,doubleComplex* inp2,int size2,doubleComplex* oup) +{ + if ((zreals(inp1[0])!=zreals(inp2[0]))&&(zimags(inp1[0])!=zimags(inp2[0]))) + { + printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz. + return; + } + int i, j; + + for(i=0;i<size1*size2;i++) oup[i] = 0; // Initializing the output matrix with zeros. + + for (i = 0; i<size1; i++) + { + for (j = 0; j<size2; j++) + { + oup[j*size1] = inp2[j]; // Elements of the second input vector are copied to the first row of the Toeplitx Matrix. + } + oup[i] = inp1[i]; // Elements of the first input vector are copied to the first column of the Toeplitx Matrix. + } + for (i = size2+1; i<size1*size2; i++) // Loop to build the rest of the Toeplitz matrix. + { + if (zreals(oup[i]) == 0 && zimags(oup[i]) == 0) + oup[i] = oup[i-size2-1]; + } +} diff --git a/2.3-1/src/c/signalProcessing/%k/dmodka.c b/2.3-1/src/c/signalProcessing/%k/dmodka.c index c0630ec0..8368cb6b 100644 --- a/2.3-1/src/c/signalProcessing/%k/dmodka.c +++ b/2.3-1/src/c/signalProcessing/%k/dmodka.c @@ -1,3 +1,14 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ #include<stdio.h> #include<math.h> #include "modk.h" @@ -10,7 +21,6 @@ double max_calc(double* ptr,int sz) ptr[0]=-1*ptr[0]; } mx=(ptr[0]); - //printf("%lf\n",mx); for(i=1;i<sz;i++) { if(ptr[i]<0) @@ -47,10 +57,7 @@ void dmodka(double* inp,int size,double* oup) c[l]=sqrt(inp[l]); } - int x=0; - //double maxi; - //maxi=max_calc(c,size); - //printf("%lf",maxi); + int x=0; while(max_calc(c,size)>eps) { @@ -88,10 +95,4 @@ void dmodka(double* inp,int size,double* oup) } } -/* -int main() -{ - double m[3]={0.1,0.2,0.3}; - dka(m,3); -} -*/ + diff --git a/2.3-1/src/c/signalProcessing/%sn/dmodsns.c b/2.3-1/src/c/signalProcessing/%sn/dmodsns.c index 06d0a6f0..aae16c19 100644 --- a/2.3-1/src/c/signalProcessing/%sn/dmodsns.c +++ b/2.3-1/src/c/signalProcessing/%sn/dmodsns.c @@ -82,12 +82,4 @@ double dmodsns(double uu, double emmc) } return sn; } -/* -int main() -{ - double u,k; - u=4; - k=0.7; - sn(u,k); -} -*/ + diff --git a/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c b/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c index 9af0c8e8..58ef3035 100644 --- a/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c +++ b/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c @@ -21,7 +21,7 @@ void dell1maga(double eps,double m1,double* z,int size,double* oup ) int i; for(i=0;i<size;i++) { - s[i]=zmodsns(z[i],m1); + s[i]=dmodsns(z[i],m1); } double un[size]; int j; diff --git a/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c b/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c index 6e7a6f93..35b49281 100644 --- a/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c +++ b/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c @@ -14,6 +14,9 @@ #include "modsn.h" #include "ell1mag.h" #include "doubleComplex.h" +#include "multiplication.h" +#include "addition.h" +#include "division.h" void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup ) { @@ -31,9 +34,15 @@ void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup ) } doubleComplex v; int k; + double ml; + ml=eps*eps; + doubleComplex tp1,tp2,tp3; for(k=0;k<size;k++) { - v=un[k]/(un[k]+(eps*eps*s[k]*s[k])); + tp1=zmuls(s[k],s[k]); + tp2=DoubleComplex(ml,0); + tp3=DoubleComplex(un[k],0); + v=zrdivs(tp3,zadds(tp3,(zmuls(tp2,tp1)))); oup[k]=zreals(v); } } diff --git a/2.3-1/src/c/signalProcessing/ffilt/gffilts.c b/2.3-1/src/c/signalProcessing/ffilt/gffilts.c index 538daf3e..09876d00 100644 --- a/2.3-1/src/c/signalProcessing/ffilt/gffilts.c +++ b/2.3-1/src/c/signalProcessing/ffilt/gffilts.c @@ -80,11 +80,4 @@ void gffilts(char* ft,int size,double N,double fc,double fh,double* oup) oup[id]=1+oup[id]; } } -/* -int main() -{ - string s; - int n; - double fl,fh; -} -*/ + diff --git a/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c b/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c index d2079f4d..e44f464e 100644 --- a/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c +++ b/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c @@ -11,11 +11,9 @@ */ #include<stdio.h> - #include<math.h> #include "sincd.h" #include "fsfirlin.h" -//#define PI 3.14159265358979 void dfsfirlina(double* hd,int size,double flag,double* hst) { diff --git a/2.3-1/src/c/signalProcessing/sincd/dsincds.c b/2.3-1/src/c/signalProcessing/sincd/dsincds.c index 1475d8de..c9f2f815 100644 --- a/2.3-1/src/c/signalProcessing/sincd/dsincds.c +++ b/2.3-1/src/c/signalProcessing/sincd/dsincds.c @@ -13,7 +13,6 @@ #include<stdio.h> #include<math.h> #include "sincd.h" -//#define PI 3.14159265358979 void dsincds(double n,double flg,double* oup) { double npt=4*n; diff --git a/2.3-1/src/c/signalProcessing/sincd/u8sincds.c b/2.3-1/src/c/signalProcessing/sincd/u8sincds.c index d03f48ae..ff0a2acc 100644 --- a/2.3-1/src/c/signalProcessing/sincd/u8sincds.c +++ b/2.3-1/src/c/signalProcessing/sincd/u8sincds.c @@ -13,12 +13,11 @@ #include<stdio.h> #include<math.h> #include "sincd.h" -#define PI 3.14159265358979 void u8sincds(int n,int flg,double* oup) { double npt=4*n; int sz=4*n; - double pas=PI/npt; + double pas=M_PI/npt; double om[sz+1]; int i; //om[0]=0; @@ -69,7 +68,7 @@ void u8sincds(int n,int flg,double* oup) int a; for(a=0;a<=4*n;a++) { - om[a]=om[a]-(PI/(2*n)); + om[a]=om[a]-(M_PI/(2*n)); } int j,k; for(j=0;j<=4*n;j++) diff --git a/2.3-1/src/c/signalProcessing/zmodsns.c b/2.3-1/src/c/signalProcessing/zmodsns.c new file mode 100644 index 00000000..5f35059f --- /dev/null +++ b/2.3-1/src/c/signalProcessing/zmodsns.c @@ -0,0 +1,161 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + Reference:- Abramowitz, Milton and Stegun, Irene A + Handbook of Mathematical Functions, Dover, 1965 + Chapter 16 (Sections 16.4, 16.13 and 16.15) + Link for FORTRAN code:-http://www.aip.de/groups/soe/local/numres/bookfpdf/f6-11.pdf +*/ + +#include<stdio.h> +#include<math.h> +#include "modsn.h" +#include "doubleComplex.h" +#define CA 0.0003 + +doubleComplex zmodsns(doubleComplex uu,double emmc) +{ + doubleComplex ans; + double uur,uui; + uur=zreals(uu); + uui=zimags(uu); + double sr,cr,dr; + //Performing Elliptic Function operation for the real values + double a1,b1,c1,d1,emc1,u1; + double em1[14],en1[14]; + int i1,ii1,l1,bo1; + emc1=1-emmc; + u1=uur; + if(emc1) + { + bo1=(emc1<0.0); + if(bo1) + { + d1=1.0-emc1; + emc1/=-1.0/d1; + u1*=(d1=sqrt(d1)); + } + a1=1.0; + dr=1.0; + for(i1=1;i1<=13;i1++) + { + l1=i1; + em1[i1]=a1; + en1[i1]=(emc1=sqrt(emc1)); + c1=0.5*(a1+emc1); + if(fabs(a1-emc1)<=CA*a1)break; + emc1*=a1; + a1=c1; + } + u1*=c1; + sr=sin(u1); + cr=cos(u1); + if(sr) + { + a1=cr/sr; + c1*=a1; + for(ii1=l1;ii1>=1;ii1--) + { + b1=em1[ii1]; + a1*=c1; + c1*=dr; + dr=(en1[ii1]+a1)/(b1+a1); + a1=c1/b1; + } + a1=1.0/sqrt(c1*c1+1.0); + sr=(sr>=0.0?a1:-a1); + cr=c1*(sr); + } + if(bo1) + { + a1=dr; + dr=cr; + cr=a1; + sr/=d1; + } + } + else + { + cr=1.0/cosh(u1); + dr=cr; + sr=tanh(u1); + } + //////////////////////////////////////////////////////////////// + double si,ci,di; + //Performing Elleptic Function operation for the imaginary values + double a,b,c,d,emc,u; + double em[14],en[14]; + int i,ii,l,bo; + //double s1,c1,d1; + emc=emmc; + u=uui; + if(emc) + { + bo=(emc<0.0); + if(bo) + { + d=1.0-emc; + emc/=-1.0/d; + u*=(d=sqrt(d)); + } + a=1.0; + di=1.0; + for(i=1;i<=13;i++) + { + l=i; + em[i]=a; + en[i]=(emc=sqrt(emc)); + c=0.5*(a+emc); + if(fabs(a-emc)<=CA*a)break; + emc*=a; + a=c; + } + u*=c; + si=sin(u); + ci=cos(u); + if(si) + { + a=ci/si; + c*=a; + for(ii=l;ii>=1;ii--) + { + b=em[ii]; + a*=c; + c*=di; + di=(en[ii]+a)/(b+a); + a=c/b; + } + a=1.0/sqrt(c*c+1.0); + si=(si>=0.0?a:-a); + ci=c*(si); + } + if(bo) + { + a=di; + di=ci; + ci=a; + si/=d; + } + } + else + { + ci=1.0/cosh(u); + di=ci; + si=tanh(u); + } + ///////////////////////////////////////////////////////// + double delta; + delta=ci*ci + emmc*sr*sr*si*si; + double snir,snii; + snir=(sr*di)/delta; + snii=(cr*dr*si*ci)/delta; + ans=DoubleComplex(snir,snii); + return ans; +} diff --git a/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c b/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c index 33f22af9..7b9fe9b4 100644 --- a/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c +++ b/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c @@ -12,6 +12,7 @@ #include<stdio.h> #include<math.h> #include "zpbutt.h" +#include "doubleComplex.h" #define PI 3.14159265 double dzpbutts(double n,double fl,doubleComplex* out) { diff --git a/2.3-1/src/c/string/ascii/gasciia.c b/2.3-1/src/c/string/ascii/gasciia.c index ec11d6e2..5fe95e07 100644 --- a/2.3-1/src/c/string/ascii/gasciia.c +++ b/2.3-1/src/c/string/ascii/gasciia.c @@ -14,12 +14,12 @@ into its ascii equivalent. */ #include "ascii.h" -void gasciia(char *str,int size,int* oup) +void gasciia(char *str,int size,uint8* oup) { int i; for(i=0;i<size;i++) { - *(oup+i)=(int)str[i]; + *(oup+i)=str[i]; } } diff --git a/2.3-1/src/c/string/disp/zdispa.c b/2.3-1/src/c/string/disp/zdispa.c index 6f651b83..94b24e98 100644 --- a/2.3-1/src/c/string/disp/zdispa.c +++ b/2.3-1/src/c/string/disp/zdispa.c @@ -16,11 +16,7 @@ double zdispa (doubleComplex* in, int rows, int columns){ int i = 0,j = 0; for (i = 0; i < rows; ++i) { -<<<<<<< HEAD - for (j=0;j<columns;j++) printf(" %1.20lf + %1.20lfi " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); -======= - for (j=0;j<columns;j++) printf(" %1.20f + %1.20fi " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + for (j=0;j<columns;j++) printf(" %e + %ei " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); printf("\n"); } return 0; diff --git a/2.3-1/src/c/string/disp/zdisps.c b/2.3-1/src/c/string/disp/zdisps.c index c4ec137f..4a040cd7 100644 --- a/2.3-1/src/c/string/disp/zdisps.c +++ b/2.3-1/src/c/string/disp/zdisps.c @@ -14,6 +14,6 @@ double zdisps (doubleComplex in) { - printf(" %1.20f + %1.20fi \n" ,zreals(in) ,zimags(in)); + printf(" %e + %ei \n" ,zreals(in) ,zimags(in)); return 0; } diff --git a/2.3-1/src/c/string/includes/ascii.h b/2.3-1/src/c/string/includes/ascii.h index fcf969da..39aeb835 100644 --- a/2.3-1/src/c/string/includes/ascii.h +++ b/2.3-1/src/c/string/includes/ascii.h @@ -17,7 +17,7 @@ extern "C" { #endif -void gasciia(char* str,int size,int* oup); +void gasciia(char* str,int size,uint8* oup); void dasciia(double* inp,int size,char* oup); #ifdef __cplusplus diff --git a/2.3-1/src/c/string/strcspn/gstrcspna.c b/2.3-1/src/c/string/strcspn/gstrcspna.c index 75912e9d..2c83c724 100644 --- a/2.3-1/src/c/string/strcspn/gstrcspna.c +++ b/2.3-1/src/c/string/strcspn/gstrcspna.c @@ -14,14 +14,13 @@ #include "strcspn.h" uint8 gstrcspna(char *str1,int size1,char *str2,int size2) { - int ind,i,j;; - for(i=0;i<=size1;i++) - int j; - for(i=0;i<=size1;i++) + int ind,i,j; + + for(i=0;i<=size2;i++) { - for(j=0;j<=size2;j++) + for(j=0;j<=size1;j++) { - if(str2[j]==str1[i]) + if(str2[i]==str1[j]) { ind=j; break; @@ -30,22 +29,4 @@ uint8 gstrcspna(char *str1,int size1,char *str2,int size2) } return (ind+1); } -/*int main() -{ - int n1,n2; - char inp1[100000],inp2[100000]; - printf("Enter the length of the first string"); - scanf("%d",&n1); - for(int i=0;i<=(n1+1);i++) - { - scanf("%c",&inp1[i]); - } - printf("Enter the length of the second string"); - scanf("%d",&n2 ); - for(int j=0;j<=(n2+1);j++) - { - scanf("%c",&inp2[j]); - } - strcspnfn(inp1,n1+1,inp2,n2+1); -} -*/ + diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testfullrf/testfullrf.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testfullrf/testfullrf.sci new file mode 100644 index 00000000..49d3c7a2 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testfullrf/testfullrf.sci @@ -0,0 +1,7 @@ +function testfullrf() + A = [1,2,3;4,5,6;7,8,9] + [Q,M,rk] = fullrf(A) + disp(Q) + disp(M) + disp(rk) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testgivens/testgivens.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testgivens/testgivens.sci new file mode 100644 index 00000000..3ef0d284 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testgivens/testgivens.sci @@ -0,0 +1,7 @@ +function testgivens() + a = [1] + b = [2] + [u,c] = givens(a,b) + disp(u) + disp(c) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testhess/testhess.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testhess/testhess.sci new file mode 100644 index 00000000..f991ae9f --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testhess/testhess.sci @@ -0,0 +1,5 @@ +function testhess() + a = [0,0,0,0;0,6,7,8;9,10,11,12;13,14,15,16]; + h = hess(a) + disp(h) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testhouseholder/testhouseholder.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testhouseholder/testhouseholder.sci new file mode 100644 index 00000000..30b4c20e --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testhouseholder/testhouseholder.sci @@ -0,0 +1,6 @@ +function testhouseholder() + A = [1;2;3;4;5] + B = [6;7;8;9;10] + u = householder(A,B) + disp(u) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testnorm/testnorm.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testnorm/testnorm.sci new file mode 100644 index 00000000..727a895f --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testnorm/testnorm.sci @@ -0,0 +1,6 @@ +//* Function to find, norm(a,2) +function testnorm() + a = [1,2,3;4,5,6;7,8,9] // Matrix + d = norm(a,2); // Calling NORM function. + disp(d) // display output +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testqr/testQR.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testqr/testQR.sci new file mode 100644 index 00000000..292e1cba --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testqr/testQR.sci @@ -0,0 +1,8 @@ +function testQR() + A = [1,2,3;4,5,6] + [u,a,rk,e] = qr(A); + disp(u) + disp(a) + disp(rk) + disp(e) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testrowcomp/testrcomp.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testrowcomp/testrcomp.sci new file mode 100644 index 00000000..f8da9482 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testrowcomp/testrcomp.sci @@ -0,0 +1,6 @@ +function testrcomp() + A = [1,2,3;4,5,6] + [u,rk] = rowcomp(A,"qr") + disp(u) + disp(rk) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testspec/testspec.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testspec/testspec.sci new file mode 100644 index 00000000..6e9346d4 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testspec/testspec.sci @@ -0,0 +1,9 @@ +function testspec() + A = [1,2,3;4,5,6;7,8,9] + B = [10,11,12;13,14,15;16,17,18] + [R,diagevals,c,d] = spec(A,B) + disp(R) + disp(diagevals) + disp(c) + disp(d) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci new file mode 100644 index 00000000..63db1f49 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci @@ -0,0 +1,5 @@ +function testsqroot() + a = [1,2,3;4,5,6;7,8,9]; + e = sqroot(a); + disp(e) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsva.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsva.sci new file mode 100644 index 00000000..c7107236 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsva.sci @@ -0,0 +1,7 @@ +function testsva() + a = [1,2,3,4;5,6,7,8;9,10,11,12] + [u,s,v] = sva(a) + disp(u) + disp(s) + disp(v) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsvatol.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsvatol.sci new file mode 100644 index 00000000..b199ec36 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsva/testsvatol.sci @@ -0,0 +1,9 @@ +// function Singular Value Approx. + +function testsvatol() + a = [1,2,3,4;5,6,7,8;9,10,11,12] + [u,s,v] = sva(a,1) + disp(u) + disp(s) + disp(v) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvd.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvd.sci new file mode 100644 index 00000000..9a3a50a6 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvd.sci @@ -0,0 +1,6 @@ +function testsvd() + disp(" ** SVD Function (Singular Value Decomposition)** ") + A = [1,2,3,11;4,5,6,12;7,8,9,13] // Matrix - A + [s = svd(A) // Calling Function Sequence + disp(s) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdeconomy.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdeconomy.sci new file mode 100644 index 00000000..0459c790 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdeconomy.sci @@ -0,0 +1,11 @@ +function testsvdeconomy() + disp(" ** SVD Function (Singular Value Decomposition)** ") + A = [1,2,3,11;4,5,6,12;7,8,9,13] // Matrix - A + [u,s,vt] = svd(A,'e') // Calling Function Sequence + disp("U Matrix") + disp(u) // A = U*sigma*Vt + disp("Sigma Matrix") + disp(s) + disp(" V transpose ") + disp(vt) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdim.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdim.sci new file mode 100644 index 00000000..16633cce --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdim.sci @@ -0,0 +1,6 @@ +// Function double_complex - test data. +function svdim() + b = [ (5.91+5.69*%i),(3.15-4.08*%i),(4.89+4.20*%i),(7.09+2.72*%i);(1.89+3.27*%i),(4.10+6.70*%i),(7.78+4.06*%i),(4.57+2.07*%i);(3.28+3.84*%i),(-0.79+7.21*%i),(3.88+3.30*%i),(3.84+1.19*%i)] + s = svd(b) + disp(s) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdrank.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdrank.sci new file mode 100644 index 00000000..108acde8 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdrank.sci @@ -0,0 +1,13 @@ +function testsvdrank() + disp(" ** SVD Function (Singular Value Decomposition)** ") + A = [1,2,3,11;4,5,6,12;7,8,9,13] // Matrix - A + [u,s,vt,rk] = svd(A) // Calling Function Sequence + disp("U Matrix") + disp(u) // A = U*sigma*Vt + disp("Sigma Matrix") + disp(s) + disp(" V transpose ") + disp(vt) + disp("Rank") + disp(rk) +endfunction diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdreal.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdreal.sci new file mode 100644 index 00000000..0e68e003 --- /dev/null +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsvd/testsvdreal.sci @@ -0,0 +1,11 @@ +function testsvdreal() + disp(" ** SVD Function (Singular Value Decomposition)** ") + A = [1,2,3,11;4,5,6,12;7,8,9,13] // Matrix - A + [u,s,vt] = svd(A) // Calling Function Sequence + disp("U Matrix") + disp(u) // A = U*sigma*Vt + disp("Sigma Matrix") + disp(s) + disp(" V transpose ") + disp(vt) +endfunction diff --git a/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/main.sci b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/main.sci new file mode 100644 index 00000000..85fc494c --- /dev/null +++ b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/main.sci @@ -0,0 +1,33 @@ +// This is the demo function to test the analog filters +// They are of 4 types butterworth,chebyshev-1,chebyshev-2 and elliptic +// We are going to test here the butterworth, chebyshev-1 and chebyshev-2 filters +//zpbutt->butterworth filter +//zpch1 ->chebyshev type-1 filter +//zpch2 ->chebyshev type-2 filter +function main() + n=5; //n is the filter order + fl=3; //fl is the cutoff frequency + [pb,gb]=zpbutt(n,fl); + disp("poles of butterworth filter") + disp(pb); + disp("gain of butterworth filter"); + disp(gb); + + e=0.5; //e (epsilon) it is the ripples in pass band + wc=4; // wc cutoff frequency + [pc1,gc1]=zpch1(n,e,wc); + disp("poles of chebyshev-1 filter") + disp(pc1); + disp("gain of chebyshev-1 filter") + disp(gc1); + + a=4; //a is the attenuation in stop band + w=5; //w (omega) is the cutoff frequency + [zc2,pc2,gc2]=zpch2(n,a,w); + disp("zeros of chebyshev-2 filter") + disp(zc2); + disp("poles of chebyshev-2 filter") + disp(pc2); + disp("gain of chebyshev-2 filter") + disp(gc2); +endfunction diff --git a/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpbutttest.sci b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpbutttest.sci new file mode 100644 index 00000000..1ea723d6 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpbutttest.sci @@ -0,0 +1,7 @@ +function zpbutttest() + n=5; + fl=3; + [p,g]=zpbutt(n,fl); + disp(p); + disp(g); +endfunction diff --git a/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch1test.sci b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch1test.sci new file mode 100644 index 00000000..4f29e0d4 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch1test.sci @@ -0,0 +1,9 @@ +function zpch1test() + + N=5; //N is the filter order + e=0.5; //e (epsilon) it is the ripples in pass band + wc=4; // wc cutoff frequency + [p,g]=zpch1(N,e,wc); + disp(p); + disp(g); +endfunction diff --git a/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch2test.sci b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch2test.sci new file mode 100644 index 00000000..665fb41c --- /dev/null +++ b/2.3-1/tests/unit_tests/test_analogFilters/scilabcode/zpch2test.sci @@ -0,0 +1,9 @@ +function zpch2test() + n=5; + a=4; + w=5; + [z,p,g]=zpch2(n,a,w); + disp(z); + disp(p); + disp(g); +endfunction diff --git a/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/buttmagtest.sci b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/buttmagtest.sci new file mode 100644 index 00000000..c7426c2d --- /dev/null +++ b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/buttmagtest.sci @@ -0,0 +1,7 @@ +function buttmagtest() + smp=[1:5]; + od=6; + frq=2.2; + oup=buttmag(od,frq,smp); + disp(oup); +endfunction diff --git a/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/cheb1magtest.sci b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/cheb1magtest.sci new file mode 100644 index 00000000..7d096375 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/cheb1magtest.sci @@ -0,0 +1,8 @@ +function cheb1magtest() + od=5; + wfc=3; + eps=0.3; + sap=[1:5]; + out=cheb1mag(od,wfc,eps,sap); + disp(out); +endfunction diff --git a/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/ell1magtest.sci b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/ell1magtest.sci new file mode 100644 index 00000000..b53c435d --- /dev/null +++ b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/ell1magtest.sci @@ -0,0 +1,7 @@ +function ell1magtest() + eps1=0.2; + m11=0.4; + z1=[1,2,3]; + [s1]=ell1mag(eps1,m11,z1); + disp(s1); +endfunction diff --git a/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/main.sci b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/main.sci new file mode 100644 index 00000000..6a8cbc59 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_filterResponse/scilabcode/main.sci @@ -0,0 +1,20 @@ +function main() + + order=5; + sample1=[1:5]; + frq=2.2; + out1=buttmag(order,frq,sample1); + disp(out1); + + wfc=3; + eps=0.3; + sample2=[1:5]; + out2=cheb1mag(order,wfc,eps,sample2); + disp(out2); + + eps1=0.2; + m11=0.4; + z1=[1,2,3]; + [s1]=ell1mag(eps1,m11,z1); + disp(s1); +endfunction diff --git a/2.3-1/tests/unit_tests/test_jacobi/scilabcode/main.sci b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/main.sci new file mode 100644 index 00000000..ee229ebe --- /dev/null +++ b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/main.sci @@ -0,0 +1,18 @@ +// Demo function to test %sn and %k functions +// %sn is the Jacobi's elliptic function +// %k is the Jacobi's complete integral +function main() + u=[1+2*%i 2+3*%i 3+1*%i]; // the corresponding complex vector + k=0.6; // parameter of elliptic integral + [out]=%sn(u,k); + disp(out); + m=[0.1 0.2 0.3]; // parametrt of Jacobi complete integral + s=%k(m); + disp(s); +endfunction + +//Output +//for %sn +// 1.5641568 - 0.2037920i 1.0580372 + 0.0100213i 1.1386855 - 0.4631921i +// for %k +// 1.6124413 1.6596236 1.7138894 diff --git a/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modktest.sci b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modktest.sci new file mode 100644 index 00000000..613cd33b --- /dev/null +++ b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modktest.sci @@ -0,0 +1,5 @@ +function modktest() + m=[0.1 0.2 0.3]; + s=%k(m); + disp(s); +endfunction diff --git a/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modsntest.sci b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modsntest.sci new file mode 100644 index 00000000..dc5d4353 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_jacobi/scilabcode/modsntest.sci @@ -0,0 +1,6 @@ +function modsntest() + u=[1+2*%i 2+3*%i 3+1*%i]; // the corresponding complex vector + k=0.6; // parameter of elliptic integral + [out]=%sn(u,k); + disp(out); +endfunction diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest.sci new file mode 100644 index 00000000..aa0017d7 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest.sci @@ -0,0 +1,11 @@ +//This function test the ascii function in scilab. +//Ascii function takes the input string and then gives the ascii code of the string. +// The output for the scilab will be:- +//[97. 110. 107. 105. 116. 32. 105. 115. 32. 114. 97. 106.] + +function asciitest() + y="ankit is raj"; //This is the input string for testing the function. + x=ascii(y); //calling of the function + disp(x); +endfunction + diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest2.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest2.sci new file mode 100644 index 00000000..ca7dcb7e --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/asciitest2.sci @@ -0,0 +1,5 @@ +function asciitest2() + d=[97 98 99 100 101]; + si=ascii(d); + disp(si); +endfunction diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/main.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/main.sci new file mode 100644 index 00000000..4030ee09 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/main.sci @@ -0,0 +1,30 @@ +//This is the demo function to test a set of string functions +// ascii->converts the input char vector/array to corresponding ascii code or vice versa +// strchr-> it finds the occurence of a charcter in a given string +// strncpy->copy charcters from string +// strspn-> get span of character set in string + +function main() + strascii1="ankit is raj"; //This is the input string for testing the function. + asciiout1=ascii(strascii1); //calling of the function + disp(asciiout1); + + strascii2=[97 98 99 100 101]; //Input as the ascii code to get converted to string + asciiout2=ascii(strascii2); //calling the function + disp(asciiout2); + + str="This is a sample string"; + ch="s"; + out1=strchr(str,ch); + disp(out1); + + ss="Ankit Raj"; + nn=5; + resu=strncpy(ss,nn); + disp(resu); + + strsample2="Hello this is Ankit"; + a="Ank"; + oup2=strspn(a,strsample2); + disp(oup2) +endfunction diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/strchrtest.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/strchrtest.sci new file mode 100644 index 00000000..f8d34198 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/strchrtest.sci @@ -0,0 +1,6 @@ +function strchrtest() + s="This is a sample string"; + ch="s"; + y=strchr(s,ch); + disp(y); +endfunction diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/strcspntest.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/strcspntest.sci new file mode 100644 index 00000000..9a03c576 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/strcspntest.sci @@ -0,0 +1,6 @@ +function strcspntest() + x="123243545assdsc"; + y="anki5t3"; + z=strcspn(y,x); + disp(z); +endfunction diff --git a/2.3-1/tests/unit_tests/test_string/scilabcode/strncpytest.sci b/2.3-1/tests/unit_tests/test_string/scilabcode/strncpytest.sci new file mode 100644 index 00000000..14eceb83 --- /dev/null +++ b/2.3-1/tests/unit_tests/test_string/scilabcode/strncpytest.sci @@ -0,0 +1,6 @@ +function strncpytest() + ss="Ankit Raj"; + nn=5; + resu=strncpy(ss,nn); + disp(resu); +endfunction diff --git a/2.3-1/thirdparty/lib/raspberrypi/libcblas.a b/2.3-1/thirdparty/lib/raspberrypi/libcblas.a Binary files differindex 719376dd..bbba3e21 100644 --- a/2.3-1/thirdparty/lib/raspberrypi/libcblas.a +++ b/2.3-1/thirdparty/lib/raspberrypi/libcblas.a diff --git a/2.3-1/thirdparty/lib/raspberrypi/liblapack.a b/2.3-1/thirdparty/lib/raspberrypi/liblapack.a Binary files differindex 9af700fc..6165c435 100644 --- a/2.3-1/thirdparty/lib/raspberrypi/liblapack.a +++ b/2.3-1/thirdparty/lib/raspberrypi/liblapack.a diff --git a/2.3-1/thirdparty/lib/raspberrypi/librefblas.a b/2.3-1/thirdparty/lib/raspberrypi/librefblas.a Binary files differindex 0307f908..d1921c42 100644 --- a/2.3-1/thirdparty/lib/raspberrypi/librefblas.a +++ b/2.3-1/thirdparty/lib/raspberrypi/librefblas.a |
