From 474a255a2ab5349b1b140eb7f2396ceba14966a4 Mon Sep 17 00:00:00 2001 From: Starrlight Augustine Date: Thu, 30 Jul 2015 11:25:33 +0200 Subject: [PATCH] Update from DEB laboratory Last update with pet routines compatible with DEB2015 - --- lib/misc/C2K.m | 27 +++++ lib/misc/K2C.m | 27 +++++ lib/misc/html/C2K.html | 90 ++++++++++++++ lib/pet/html/check_my_pet.html | 216 +++++++++++++++++++-------------- lib/pet/mydata_my_pet.asv | 212 -------------------------------- lib/pet/mydata_my_pet.m | 33 +++-- lib/pet/petregr.m | 9 +- lib/pet/petregr_f.m | 9 +- lib/regr/nmregr_options.m | 23 +++- 9 files changed, 319 insertions(+), 327 deletions(-) create mode 100644 lib/misc/C2K.m create mode 100644 lib/misc/K2C.m create mode 100644 lib/misc/html/C2K.html delete mode 100644 lib/pet/mydata_my_pet.asv diff --git a/lib/misc/C2K.m b/lib/misc/C2K.m new file mode 100644 index 00000000..79b91e4c --- /dev/null +++ b/lib/misc/C2K.m @@ -0,0 +1,27 @@ +%% C2K +% computes Kelvin from Celsius + +%% +function K = C2K(C) + % created by Bas Kooijman 2015/01/30; modified 2015/07/28 + + %% Syntax + % K = <../C2K.m *C2K*>(C) + + %% Description + % Obtains Kelvin from temperatures defined in Celsius + % + % Input + % + % * C: scalar or matrix in temperatures in degrees Celsius + % + % Output + % + % * K: temperature(s) in Kelvin + + %% Example + % C2K(20) + + K = C + 273.15; % K, temperature in Kelvin +end + diff --git a/lib/misc/K2C.m b/lib/misc/K2C.m new file mode 100644 index 00000000..b6f7fc28 --- /dev/null +++ b/lib/misc/K2C.m @@ -0,0 +1,27 @@ +%% K2C +% computes Celsius from Kelvin + +%% +function C = K2C(K) + % created by Bas Kooijman 2015/01/30; modified 2015/07/28 + + %% Syntax + % K = <../C2K.m *C2K*>(C) + + %% Description + % Obtains Kelvin from temperatures defined in degrees Celsius + % + % Input + % + % * K: scalar or matrix in temperatures in Kelvin + % + % Output + % + % * C: temperature(s) in degrees Celsius + + %% Example + % K2C(280) + + C = K - 273.15; % K, temperature in Kelvin +end + diff --git a/lib/misc/html/C2K.html b/lib/misc/html/C2K.html new file mode 100644 index 00000000..092ce532 --- /dev/null +++ b/lib/misc/html/C2K.html @@ -0,0 +1,90 @@ + + + + + C2K

C2K

computes Kelvin from Celsius

Contents

Syntax

K = C2K(C)

Description

Obtains Kelvin from temperatures defined in Celsius

Input

  • C: scalar or matrix in temperatures in degrees Celsius

Output

  • K: temperature(s) in Kelvin

Example

C2K(20)


+ Published with MATLAB® 7.14

\ No newline at end of file diff --git a/lib/pet/html/check_my_pet.html b/lib/pet/html/check_my_pet.html index 18efe617..7000ee2f 100644 --- a/lib/pet/html/check_my_pet.html +++ b/lib/pet/html/check_my_pet.html @@ -6,7 +6,7 @@ check_my_pet

check_my_pet

Checks my_data, pars_init and predict files for field inconsistencies

Contents

Syntax

check_my_pet (speciesnm)

Description

Checks my_data, pars_init and predict files for field inconsistencies. Checking points for my_data:

* existence of standard metadata fields
-* existence of temp
-* existence of pseudodata
-* existence of weights
-* existence of units (and number consistence with type of data)
-* existence of labels (and number consistence with type of data)
-* existence of bibkeys and the corresponding entrances in biblist
-

Checking points for pars_init:

* existence of standard metapar fields
-* model is one of the predefined models
-* existence of free
-* existence of units
-* existence of labels
-

Checking points for predict:

* existence of the same fields as in data
-* length of prediction results matches the length of data
-

Input:

  • string with species name or cell vector with multiple species names

Output:

  • warnings are printed to screen

Example of use

See run_my_pet

Checking the my_data file

Checking the pars_init file

Checking the predict file


+

check_my_pet

Checks my_data, pars_init and predict files for field inconsistencies

Contents

Syntax

check_my_pet (speciesnm)

Description

Checks my_data, pars_init and predict files for field inconsistencies Checking points for my_data: - existence of standard metadata fields - existence of temp - existence of pseudodata - existence of weights - existence of units (and number consistence with type of data) - existence of labels (and number consistence with type of data) - existence of bibkeys and the corresponding entrances in biblist Checking points for pars_init: - existence of standard metapar fields - model is one of the predefined models - existence of free - existence of units - existence of labels Checking points for predict: - existence of the same fields as in data - length of prediction results matches the length of data

Input

  • speciesnms: string with species name or cell vector with multiple species names

Example of use

check_files('my_pet')

%%%%%%%%%%%%%%%%%%%%%%%%%%%

Checking the my_data file

%%%%%%%%%%%%%%%%%%%%%%%%%%%

checking the existence of metadata fields

checking if metadata.species matches speciesnm

checking the existence of temp in the data structure

checking the existence of psd in the data structure

checking the existence of weight in the data structure

checking the existence of units in the txt_data structure

checking the existence of labels in the txt_data structure

checking the existence of facts

checking the existence of bibkeys in the txt_data structure

checking the existence of bibkeys in the biblist structure

%%%%%%%%%%%%%%%%%%%%%%%%%%%

Checking the pars_init file

%%%%%%%%%%%%%%%%%%%%%%%%%%%

checking the existence of metapar fields

checking the existence of metapar fields

checking the existence of par fields

checking the existence of free in the par structure and if it filled with either 0 or 1

checking the existence of units in the txt_par structure

checking the existence of labels in the txt_par structure

checking the realism of the par set

%%%%%%%%%%%%%%%%%%%%%%%%%%%

Checking the predict file

%%%%%%%%%%%%%%%%%%%%%%%%%%%

checking the existence of psd in the Prd_data structure

checking for the bijection data-predictions

checking for the pseudodate predictions in data


Published with MATLAB® 7.14