Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10795] trunk/octave-forge/extra/lssa
|
From: <be...@us...> - 2012-07-31 15:34:47
|
Revision: 10795
http://octave.svn.sourceforge.net/octave/?rev=10795&view=rev
Author: benjf5
Date: 2012-07-31 15:34:36 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Ready for an alpha release. The data files will be improved shortly.
Modified Paths:
--------------
trunk/octave-forge/extra/lssa/DESCRIPTION
trunk/octave-forge/extra/lssa/src/Makefile
Added Paths:
-----------
trunk/octave-forge/extra/lssa/INDEX
trunk/octave-forge/extra/lssa/NEWS
trunk/octave-forge/extra/lssa/samples/
trunk/octave-forge/extra/lssa/samples/SampleDataSet.m
trunk/octave-forge/extra/lssa/samples/SampleScriptWithVostokData
Removed Paths:
-------------
trunk/octave-forge/extra/lssa/SampleScriptWithVostokData
trunk/octave-forge/extra/lssa/inst/SampleDataSet.m
Modified: trunk/octave-forge/extra/lssa/DESCRIPTION
===================================================================
--- trunk/octave-forge/extra/lssa/DESCRIPTION 2012-07-31 14:43:11 UTC (rev 10794)
+++ trunk/octave-forge/extra/lssa/DESCRIPTION 2012-07-31 15:34:36 UTC (rev 10795)
@@ -1,5 +1,5 @@
Name: lssa
-Version:
+Version: 0.1.0
Date: 2012-07-28
Author: Ben Lewis
Maintainer: Ben Lewis
@@ -10,5 +10,6 @@
URLs).
Url: http://www.jstatsoft.org/v11/i02
Problems: fast implementations, wavelet functions are currently not functional.
-Depends:
-License: GPL version 2 or later
+Depends: octave (>= 3.4.3)
+Autoload: no
+License: GPLv2+
Added: trunk/octave-forge/extra/lssa/INDEX
===================================================================
--- trunk/octave-forge/extra/lssa/INDEX (rev 0)
+++ trunk/octave-forge/extra/lssa/INDEX 2012-07-31 15:34:36 UTC (rev 10795)
@@ -0,0 +1,10 @@
+cubicwgt
+fastlscomplex
+lombcoeff
+lomgnormcoeff
+lscomplex
+lscomplexwavelet
+lscorrcoeff
+lsreal
+lsrealwavelet
+lswaveletcoeff
\ No newline at end of file
Added: trunk/octave-forge/extra/lssa/NEWS
===================================================================
--- trunk/octave-forge/extra/lssa/NEWS (rev 0)
+++ trunk/octave-forge/extra/lssa/NEWS 2012-07-31 15:34:36 UTC (rev 10795)
@@ -0,0 +1,20 @@
+Welcome to the first release of lssa, 0.1.0
+
+Current status:
+
+ ** lscomplex and lsreal both produce accurate results; they can be slow for
+ very large datasets.
+
+ ** fastlscomplex is accurate for the first octave of results; there is still an
+ error I need to pin down in the merging for additional octaves. fastlsreal
+ is disabled at the moment as I move to an implementation based on the new
+ fastlscomplex.
+
+ ** lscorrcoeff works, although I'm still attempting to understand the initial
+ author's reasoning. Its generated results are relevant to any given data
+ set, but it does not appear to be normalized to any great extent.
+
+ ** lsrealwavelet and lscomplexwavelet are not currently correct or even really
+ functional; this is an ongoing struggle for me, and if anyone can suggest
+ what I might do to improve them, please! By all means, send me an email.
+
Deleted: trunk/octave-forge/extra/lssa/SampleScriptWithVostokData
===================================================================
--- trunk/octave-forge/extra/lssa/SampleScriptWithVostokData 2012-07-31 14:43:11 UTC (rev 10794)
+++ trunk/octave-forge/extra/lssa/SampleScriptWithVostokData 2012-07-31 15:34:36 UTC (rev 10795)
@@ -1,226 +0,0 @@
-## Copyright (C) 2012 Benjamin Lewis
-## Licensed under the GNU GPL v2
-
-## This is just a sample script to introduce the purpose and usage of
-## the Lomb-Scargle Least Squares method with experimental data, here
-## using the Vostok ice core data collected and measured by J.R. Petit
-## et. al. and published in Nature; also available from the NOAA's
-## Paleoclimatology pages here:
-## <http://www.ncdc.noaa.gov/paleo/icecore/antarctica/vostok/vostok_data.html>.
-
-co2 = csvread("./data/co2.csv")(2:end,2:end);
-ch4 = csvread("./data/ch4.csv")(2:end,2:end);
-o18 = csvread("./data/o18.csv")(2:end,2:end);
-deut = csvread("./data/deut.csv")(2:end,2:end);
-dust = csvread("./data/dust.csv")(2:end,2:end);
-## The limited ranges are to deal with artifacts from the extraction of
-## the R data, notably that it leaves an extra column on the front of 0s
-## and the first row is text that Octave refuses to process.
-
-## Columns in co2 are Depth, Ice Age, Gas Age, and CO2 Concentration.
-## Columns in ch4 are Depth, Ice Age, Gas Age, and CH4 Concentration.
-## Columns in o18 are Depth, Ice Age, Gas Age, and Atmospheric O18.
-## Columns in dust are Depth, Ice Age, Dust Concentration.
-## Columns in deut are Depth, Ice Age, D concentration, and DeltaTS.
-
-co2_fig = figure("visible","off","name","CO2");
-ch4_fig = figure("visible","off","name","CH4");
-o18_fig = figure("visible","off","name","O18");
-deut_fig = figure("visible","off","name","Deuterium");
-dust_fig = figure("visible","off","name","Dust");
-## Generates figures and attaches handles to them for easy access.
-
-## Now we need some data to display; I'll run a few functions.
-ls_complex_co2_ice_age = lscomplex(co2(:,2),co2(:,4),1,100,20);
-ls_complex_co2_gas_age = lscomplex(co2(:,3),co2(:,4),1,100,20);
-ls_real_co2_ice_age = lsreal(co2(:,2),co2(:,4),1,100,20);
-ls_real_co2_gas_age = lsreal(co2(:,3),co2(:,4),1,100,20);
-ls_complex_ch4_ice_age = lscomplex(ch4(:,2),ch4(:,4),1,100,20);
-ls_complex_ch4_gas_age = lscomplex(ch4(:,3),ch4(:,4),1,100,20);
-ls_real_ch4_ice_age = lsreal(ch4(:,2),ch4(:,4),1,100,20);
-ls_real_ch4_gas_age = lsreal(ch4(:,3),ch4(:,4),1,100,20);
-ls_complex_o18_ice_age = lscomplex(o18(:,2),o18(:,4),1,100,20);
-ls_complex_o18_gas_age = lscomplex(o18(:,3),o18(:,4),1,100,20);
-ls_real_o18_ice_age = lsreal(o18(:,2),o18(:,4),1,100,20);
-ls_real_o18_gas_age = lsreal(o18(:,3),o18(:,4),1,100,20);
-ls_complex_deut = lscomplex(deut(:,2),deut(:,3),1,100,20);
-ls_real_deut = lsreal(deut(:,2),deut(:,3),1,100,20);
-ls_complex_dust = lscomplex(dust(:,2),dust(:,3),1,100,20);
-ls_real_dust = lsreal(dust(:,2),dust(:,3),1,100,20);
-
-x_data_axis_vector = [ -430000, 0 ];
-## Useful because all of the data extends over 430 000 years up to the
-## present.
-
-## Setting up the CO2 plots:
-figure(co2_fig);
-subplot(4,2,1);
-axis(x_data_axis_vector);
-plot(-(co2(:,2)),co2(:,4));
-title("Gas levels over ice age");
-subplot(4,2,2);
-axis(x_data_axis_vector);
-plot(-(co2(:,3),co2(:,4));
-title("Gas levels over gas age");
-subplot(4,2,3);
-plot(real(ls_complex_co2_ice_age));
-hold on;
-plot(imag(ls_complex_co2_ice_age),'r');
-title("Complex L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,4);
-plot(real(ls_complex_co2_gas_age));
-hold on;
-plot(imag(ls_complex_co2_gas_age),'r');
-title("Complex L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-subplot(4,2,5);
-plot(real(ls_real_co2_ice_age));
-hold on;
-plot(imag(ls_real_co2_ice_age),'r');
-title("Real L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,6);
-plot(real(ls_real_co2_gas_age));
-hold on;
-plot(imag(ls_real_co2_gas_age));
-title("Real L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-## At this point, we have transforms of both datasets, real and complex,
-## and just need to figure out what cool thing to do with the remaining slot.
-
-## Setting up the CH4 plots
-figure(ch4_fig);
-subplot(4,2,1);
-axis(x_data_axis_vector);
-plot(-(ch4(:,2)),ch4(:,4));
-title("Gas levels over ice age");
-subplot(4,2,2);
-axis(x_data_axis_vector);
-plot(-(ch4(:,3),ch4(:,4));
-title("Gas levels over gas age");
-subplot(4,2,3);
-plot(real(ls_complex_ch4_ice_age));
-hold on;
-plot(imag(ls_complex_ch4_ice_age),'r');
-title("Complex L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,4);
-plot(real(ls_complex_ch4_gas_age));
-hold on;
-plot(imag(ls_complex_ch4_gas_age),'r');
-title("Complex L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-subplot(4,2,5);
-plot(real(ls_real_ch4_ice_age));
-hold on;
-plot(imag(ls_real_ch4_ice_age),'r');
-title("Real L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,6);
-plot(real(ls_real_ch4_gas_age));
-hold on;
-plot(imag(ls_real_ch4_gas_age));
-title("Real L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-
-## Setting up the O18 plots:
-figure(o18_fig);
-subplot(4,2,1);
-axis(x_data_axis_vector);
-plot(-(o18(:,2)),o18(:,4));
-title("Gas levels over ice age");
-subplot(4,2,2);
-axis(x_data_axis_vector);
-plot(-(o18(:,3),o18(:,4));
-title("Gas levels over gas age");
-subplot(4,2,3);
-plot(real(ls_complex_o18_ice_age));
-hold on;
-plot(imag(ls_complex_o18_ice_age),'r');
-title("Complex L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,4);
-plot(real(ls_complex_o18_gas_age));
-hold on;
-plot(imag(ls_complex_o18_gas_age),'r');
-title("Complex L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-subplot(4,2,5);
-plot(real(ls_real_o18_ice_age));
-hold on;
-plot(imag(ls_real_o18_ice_age),'r');
-title("Real L-S transform of Gas/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,2,6);
-plot(real(ls_real_o18_gas_age));
-hold on;
-plot(imag(ls_real_o18_gas_age));
-title("Real L-S transform of Gas/gas age data");
-legend("Real part","Imaginary part");
-
-## Setting up Dust plots:
-figure(dust_fig);
-subplot(4,1,1);
-axis(x_data_axis_vector);
-plot(-(dust(:,2)),dust(:,3));
-title("Dust levels over ice age");
-subplot(4,1,2);
-plot(real(ls_complex_dust_ice_age));
-hold on;
-plot(imag(ls_complex_dust_ice_age),'r');
-title("Complex L-S transform of Dust/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,1,3);
-plot(real(ls_real_dust_ice_age));
-hold on;
-plot(imag(ls_real_dust_ice_age),'r');
-title("Real L-S transform of Dust/ice age data");
-legend("Real part","Imaginary part");
-
-## Setting up Deuterium plots:
-figure(deut_fig);
-subplot(4,1,1);
-axis(x_data_axis_vector);
-plot(-(deut(:,2)),deut(:,3));
-title("Deuterium levels over ice age");
-subplot(4,1,2);
-plot(real(ls_complex_deut_ice_age));
-hold on;
-plot(imag(ls_complex_deut_ice_age),'r');
-title("Complex L-S transform of Deuterium/ice age data");
-legend("Real part","Imaginary part");
-subplot(4,1,3);
-plot(real(ls_real_deut_ice_age));
-hold on;
-plot(imag(ls_real_deut_ice_age),'r');
-title("Real L-S transform of Deuterium/ice age data");
-legend("Real part","Imaginary part");
-
-co2_ch4_comparison_figure = figure("visible","off","name","CO2/CH4
-comparison");
-subplot(4,1,1);
-axes(x_data_axis_vector);
-plot(-(co2(:,2)),co2(:,4));
-hold on;
-plot(-(ch4(:,2)),ch4(:,4),'g');
-title("CO2 and CH4 data");
-legend("CO2","CH4");
-
-subplot(4,1,2);
-plot(abs(ls_complex_co2_ice_age));
-hold on;
-plot(abs(ls_complex_ch4_gas_age),'g');
-title("Abs. values of CO2 and CH4 L-S complex transforms");
-legend("CO2,CH4");
-
-
-
-
-
-
-## to implement:
-## - displays of all the data and flaws in trying to model with just
- ## using L-S data
-## - correlations of every data set with every other data set
-## - Comparing ls* results to periodogram results
\ No newline at end of file
Deleted: trunk/octave-forge/extra/lssa/inst/SampleDataSet.m
===================================================================
--- trunk/octave-forge/extra/lssa/inst/SampleDataSet.m 2012-07-31 14:43:11 UTC (rev 10794)
+++ trunk/octave-forge/extra/lssa/inst/SampleDataSet.m 2012-07-31 15:34:36 UTC (rev 10795)
@@ -1,25 +0,0 @@
-## Copyright (C) 2012 Benjamin Lewis <be...@gm...>
-##
-## This program is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-##
-## This program is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-## details.
-##
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, see <http://www.gnu.org/licenses/>.
-
-## No function structure to this, I just want to use it to store the
-## sums of sines and cosines I'll use for testing.
-
-xvec = linspace(0,8,1000);
-maxfreq = 4 / ( 2 * pi );
-
-yvec = ( 2.*sin(maxfreq.*xvec) + 3.*sin((3/4)*maxfreq.*xvec)
- - 0.5 .* sin((1/4)*maxfreq.*xvec) - 0.2 .* cos(maxfreq .* xvec)
- + cos((1/4)*maxfreq.*xvec));
-
Copied: trunk/octave-forge/extra/lssa/samples/SampleDataSet.m (from rev 10785, trunk/octave-forge/extra/lssa/inst/SampleDataSet.m)
===================================================================
--- trunk/octave-forge/extra/lssa/samples/SampleDataSet.m (rev 0)
+++ trunk/octave-forge/extra/lssa/samples/SampleDataSet.m 2012-07-31 15:34:36 UTC (rev 10795)
@@ -0,0 +1,25 @@
+## Copyright (C) 2012 Benjamin Lewis <be...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
+## No function structure to this, I just want to use it to store the
+## sums of sines and cosines I'll use for testing.
+
+xvec = linspace(0,8,1000);
+maxfreq = 4 / ( 2 * pi );
+
+yvec = ( 2.*sin(maxfreq.*xvec) + 3.*sin((3/4)*maxfreq.*xvec)
+ - 0.5 .* sin((1/4)*maxfreq.*xvec) - 0.2 .* cos(maxfreq .* xvec)
+ + cos((1/4)*maxfreq.*xvec));
+
Copied: trunk/octave-forge/extra/lssa/samples/SampleScriptWithVostokData (from rev 10785, trunk/octave-forge/extra/lssa/SampleScriptWithVostokData)
===================================================================
--- trunk/octave-forge/extra/lssa/samples/SampleScriptWithVostokData (rev 0)
+++ trunk/octave-forge/extra/lssa/samples/SampleScriptWithVostokData 2012-07-31 15:34:36 UTC (rev 10795)
@@ -0,0 +1,226 @@
+## Copyright (C) 2012 Benjamin Lewis
+## Licensed under the GNU GPL v2
+
+## This is just a sample script to introduce the purpose and usage of
+## the Lomb-Scargle Least Squares method with experimental data, here
+## using the Vostok ice core data collected and measured by J.R. Petit
+## et. al. and published in Nature; also available from the NOAA's
+## Paleoclimatology pages here:
+## <http://www.ncdc.noaa.gov/paleo/icecore/antarctica/vostok/vostok_data.html>.
+
+co2 = csvread("./data/co2.csv")(2:end,2:end);
+ch4 = csvread("./data/ch4.csv")(2:end,2:end);
+o18 = csvread("./data/o18.csv")(2:end,2:end);
+deut = csvread("./data/deut.csv")(2:end,2:end);
+dust = csvread("./data/dust.csv")(2:end,2:end);
+## The limited ranges are to deal with artifacts from the extraction of
+## the R data, notably that it leaves an extra column on the front of 0s
+## and the first row is text that Octave refuses to process.
+
+## Columns in co2 are Depth, Ice Age, Gas Age, and CO2 Concentration.
+## Columns in ch4 are Depth, Ice Age, Gas Age, and CH4 Concentration.
+## Columns in o18 are Depth, Ice Age, Gas Age, and Atmospheric O18.
+## Columns in dust are Depth, Ice Age, Dust Concentration.
+## Columns in deut are Depth, Ice Age, D concentration, and DeltaTS.
+
+co2_fig = figure("visible","off","name","CO2");
+ch4_fig = figure("visible","off","name","CH4");
+o18_fig = figure("visible","off","name","O18");
+deut_fig = figure("visible","off","name","Deuterium");
+dust_fig = figure("visible","off","name","Dust");
+## Generates figures and attaches handles to them for easy access.
+
+## Now we need some data to display; I'll run a few functions.
+ls_complex_co2_ice_age = lscomplex(co2(:,2),co2(:,4),1,100,20);
+ls_complex_co2_gas_age = lscomplex(co2(:,3),co2(:,4),1,100,20);
+ls_real_co2_ice_age = lsreal(co2(:,2),co2(:,4),1,100,20);
+ls_real_co2_gas_age = lsreal(co2(:,3),co2(:,4),1,100,20);
+ls_complex_ch4_ice_age = lscomplex(ch4(:,2),ch4(:,4),1,100,20);
+ls_complex_ch4_gas_age = lscomplex(ch4(:,3),ch4(:,4),1,100,20);
+ls_real_ch4_ice_age = lsreal(ch4(:,2),ch4(:,4),1,100,20);
+ls_real_ch4_gas_age = lsreal(ch4(:,3),ch4(:,4),1,100,20);
+ls_complex_o18_ice_age = lscomplex(o18(:,2),o18(:,4),1,100,20);
+ls_complex_o18_gas_age = lscomplex(o18(:,3),o18(:,4),1,100,20);
+ls_real_o18_ice_age = lsreal(o18(:,2),o18(:,4),1,100,20);
+ls_real_o18_gas_age = lsreal(o18(:,3),o18(:,4),1,100,20);
+ls_complex_deut = lscomplex(deut(:,2),deut(:,3),1,100,20);
+ls_real_deut = lsreal(deut(:,2),deut(:,3),1,100,20);
+ls_complex_dust = lscomplex(dust(:,2),dust(:,3),1,100,20);
+ls_real_dust = lsreal(dust(:,2),dust(:,3),1,100,20);
+
+x_data_axis_vector = [ -430000, 0 ];
+## Useful because all of the data extends over 430 000 years up to the
+## present.
+
+## Setting up the CO2 plots:
+figure(co2_fig);
+subplot(4,2,1);
+axis(x_data_axis_vector);
+plot(-(co2(:,2)),co2(:,4));
+title("Gas levels over ice age");
+subplot(4,2,2);
+axis(x_data_axis_vector);
+plot(-(co2(:,3),co2(:,4));
+title("Gas levels over gas age");
+subplot(4,2,3);
+plot(real(ls_complex_co2_ice_age));
+hold on;
+plot(imag(ls_complex_co2_ice_age),'r');
+title("Complex L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,4);
+plot(real(ls_complex_co2_gas_age));
+hold on;
+plot(imag(ls_complex_co2_gas_age),'r');
+title("Complex L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+subplot(4,2,5);
+plot(real(ls_real_co2_ice_age));
+hold on;
+plot(imag(ls_real_co2_ice_age),'r');
+title("Real L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,6);
+plot(real(ls_real_co2_gas_age));
+hold on;
+plot(imag(ls_real_co2_gas_age));
+title("Real L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+## At this point, we have transforms of both datasets, real and complex,
+## and just need to figure out what cool thing to do with the remaining slot.
+
+## Setting up the CH4 plots
+figure(ch4_fig);
+subplot(4,2,1);
+axis(x_data_axis_vector);
+plot(-(ch4(:,2)),ch4(:,4));
+title("Gas levels over ice age");
+subplot(4,2,2);
+axis(x_data_axis_vector);
+plot(-(ch4(:,3),ch4(:,4));
+title("Gas levels over gas age");
+subplot(4,2,3);
+plot(real(ls_complex_ch4_ice_age));
+hold on;
+plot(imag(ls_complex_ch4_ice_age),'r');
+title("Complex L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,4);
+plot(real(ls_complex_ch4_gas_age));
+hold on;
+plot(imag(ls_complex_ch4_gas_age),'r');
+title("Complex L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+subplot(4,2,5);
+plot(real(ls_real_ch4_ice_age));
+hold on;
+plot(imag(ls_real_ch4_ice_age),'r');
+title("Real L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,6);
+plot(real(ls_real_ch4_gas_age));
+hold on;
+plot(imag(ls_real_ch4_gas_age));
+title("Real L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+
+## Setting up the O18 plots:
+figure(o18_fig);
+subplot(4,2,1);
+axis(x_data_axis_vector);
+plot(-(o18(:,2)),o18(:,4));
+title("Gas levels over ice age");
+subplot(4,2,2);
+axis(x_data_axis_vector);
+plot(-(o18(:,3),o18(:,4));
+title("Gas levels over gas age");
+subplot(4,2,3);
+plot(real(ls_complex_o18_ice_age));
+hold on;
+plot(imag(ls_complex_o18_ice_age),'r');
+title("Complex L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,4);
+plot(real(ls_complex_o18_gas_age));
+hold on;
+plot(imag(ls_complex_o18_gas_age),'r');
+title("Complex L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+subplot(4,2,5);
+plot(real(ls_real_o18_ice_age));
+hold on;
+plot(imag(ls_real_o18_ice_age),'r');
+title("Real L-S transform of Gas/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,2,6);
+plot(real(ls_real_o18_gas_age));
+hold on;
+plot(imag(ls_real_o18_gas_age));
+title("Real L-S transform of Gas/gas age data");
+legend("Real part","Imaginary part");
+
+## Setting up Dust plots:
+figure(dust_fig);
+subplot(4,1,1);
+axis(x_data_axis_vector);
+plot(-(dust(:,2)),dust(:,3));
+title("Dust levels over ice age");
+subplot(4,1,2);
+plot(real(ls_complex_dust_ice_age));
+hold on;
+plot(imag(ls_complex_dust_ice_age),'r');
+title("Complex L-S transform of Dust/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,1,3);
+plot(real(ls_real_dust_ice_age));
+hold on;
+plot(imag(ls_real_dust_ice_age),'r');
+title("Real L-S transform of Dust/ice age data");
+legend("Real part","Imaginary part");
+
+## Setting up Deuterium plots:
+figure(deut_fig);
+subplot(4,1,1);
+axis(x_data_axis_vector);
+plot(-(deut(:,2)),deut(:,3));
+title("Deuterium levels over ice age");
+subplot(4,1,2);
+plot(real(ls_complex_deut_ice_age));
+hold on;
+plot(imag(ls_complex_deut_ice_age),'r');
+title("Complex L-S transform of Deuterium/ice age data");
+legend("Real part","Imaginary part");
+subplot(4,1,3);
+plot(real(ls_real_deut_ice_age));
+hold on;
+plot(imag(ls_real_deut_ice_age),'r');
+title("Real L-S transform of Deuterium/ice age data");
+legend("Real part","Imaginary part");
+
+co2_ch4_comparison_figure = figure("visible","off","name","CO2/CH4
+comparison");
+subplot(4,1,1);
+axes(x_data_axis_vector);
+plot(-(co2(:,2)),co2(:,4));
+hold on;
+plot(-(ch4(:,2)),ch4(:,4),'g');
+title("CO2 and CH4 data");
+legend("CO2","CH4");
+
+subplot(4,1,2);
+plot(abs(ls_complex_co2_ice_age));
+hold on;
+plot(abs(ls_complex_ch4_gas_age),'g');
+title("Abs. values of CO2 and CH4 L-S complex transforms");
+legend("CO2,CH4");
+
+
+
+
+
+
+## to implement:
+## - displays of all the data and flaws in trying to model with just
+ ## using L-S data
+## - correlations of every data set with every other data set
+## - Comparing ls* results to periodogram results
\ No newline at end of file
Modified: trunk/octave-forge/extra/lssa/src/Makefile
===================================================================
--- trunk/octave-forge/extra/lssa/src/Makefile 2012-07-31 14:43:11 UTC (rev 10794)
+++ trunk/octave-forge/extra/lssa/src/Makefile 2012-07-31 15:34:36 UTC (rev 10795)
@@ -1,13 +1,14 @@
MKOCTFILE ?= mkoctfile
-all: fastlscomplex.oct \
- fastlsreal.oct
+all: fastlscomplex.oct #\
+# fastlsreal.oct
fastlscomplex.oct: fastlscomplex.cc
$(MKOCTFILE) fastlscomplex.cc
-fastlsreal.oct: fastlsreal.cc
- $(MKOCTFILE) fastlsreal.cc
+# fastlsreal compilation is disabled for the time being
+#fastlsreal.oct: fastlsreal.cc
+# $(MKOCTFILE) fastlsreal.cc
# helper function just in case
clean:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
