From: <lm...@us...> - 2012-08-24 16:11:45
|
Revision: 10908 http://octave.svn.sourceforge.net/octave/?rev=10908&view=rev Author: lmarkov Date: 2012-08-24 16:11:37 +0000 (Fri, 24 Aug 2012) Log Message: ----------- M private/is_builtin_language.m M private/evalmf_private.m M private/get_mf_index_and_hedge.m M private/fcm_update_membership_fcn.m M private/is_var_index.m M private/is_fis.m M private/fcm_init_prototype.m M private/is_input_matrix.m M private/is_real.m M private/defuzzify_output_sugeno.m M private/fcm_compute_objective_fcn.m M private/is_io_vector.m M private/are_input_indices.m M private/is_rule_vector.m M private/defuzzify_output_mamdani.m M private/aggregate_output_sugeno.m M private/is_ref_input.m M private/is_grid_spec.m M private/fcm_update_cluster_centers.m M private/is_real_matrix.m M private/eval_firing_strength.m M private/is_io_struct.m M private/is_pos_int.m M private/is_rule_struct.m M private/is_mf_vector.m M private/are_bounds.m M private/eval_rules_sugeno.m M private/is_output_index.m M private/is_format.m M private/evalfis_private.m M private/is_mf_index.m M private/is_row_vector.m M private/is_rule_index_list.m M private/is_int.m M private/fuzzify_input.m M private/eval_rules_mamdani.m M private/aggregate_output_mamdani.m M private/are_mf_params.m M private/fcm_compute_convergence_criterion.m M private/square_distance_matrix.m M private/is_mf_struct.m M private/is_string.m M private/is_domain.m M private/probor.m Modified Paths: -------------- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_mamdani.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_sugeno.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_mf_params.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_mamdani.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_sugeno.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_firing_strength.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_mamdani.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_sugeno.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalfis_private.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_convergence_criterion.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_objective_fcn.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_init_prototype.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_cluster_centers.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_membership_fcn.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fuzzify_input.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/get_mf_index_and_hedge.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_input_matrix.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real_matrix.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_ref_input.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_row_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_index_list.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_string.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_var_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/probor.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/square_distance_matrix.m Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_mamdani.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_mamdani.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_mamdani.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -73,15 +73,15 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: aggregate_output_mamdani.m -## Last-Modified: 3 Nov 2011 +## Last-Modified: 20 Aug 2012 function fuzzy_output = aggregate_output_mamdani (fis, rule_output) - num_rules = columns (fis.rule); ## num_rules == Q (above) - num_outputs = columns (fis.output); ## num_outputs == L + num_rules = columns (fis.rule); ## num_rules == Q (above) + num_outputs = columns (fis.output); ## num_outputs == L num_points = rows (rule_output); ## Initialize output matrix to prevent inefficient resizing. @@ -90,7 +90,8 @@ ## Compute the ith fuzzy output values, then store the values in the ## ith column of the fuzzy_output matrix. for i = 1 : num_outputs - indiv_fuzzy_out = rule_output(:, (i - 1) * num_rules + 1 : i * num_rules); + indiv_fuzzy_out = ... + rule_output(:, (i - 1) * num_rules + 1 : i * num_rules); agg_fuzzy_out = (str2func (fis.aggMethod) (indiv_fuzzy_out'))'; fuzzy_output(:, i) = agg_fuzzy_out; endfor Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_sugeno.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_sugeno.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/aggregate_output_sugeno.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -71,12 +71,12 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: aggregate_output_sugeno.m -## Last-Modified: 10 Nov 2011 +## Last-Modified: 20 Aug 2012 -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- function fuzzy_output = aggregate_output_sugeno (fis, rule_output) @@ -84,12 +84,13 @@ num_outputs = columns (fis.output); num_rules = columns (fis.rule); - ## For each FIS output, aggregate the slice of the rule_output matrix, + ## For each FIS output, aggregate the slice of the rule_output matrix, ## then store the result as a structure in fuzzy_output. for i = 1 : num_outputs unagg_output = rule_output(:, (i-1)*num_rules+1 : i*num_rules); - aggregated_output = aggregate_fis_output (fis.aggMethod, unagg_output); + aggregated_output = aggregate_fis_output (fis.aggMethod, ... + unagg_output); next_agg_output = struct ('index', i, ... 'aggregated_output', aggregated_output); if (i == 1) @@ -100,19 +101,20 @@ endfor endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Function: aggregate_fis_output ## Purpose: Aggregate the multiple singletons for one FIS output. -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- -function mult_singletons = aggregate_fis_output (fis_aggmethod, rule_output) +function mult_singletons = aggregate_fis_output (fis_aggmethod, ... + rule_output) ## Initialize output matrix (multiple_singletons). mult_singletons = sortrows (rule_output', 1); - ## If adjacent rows represent singletons at the same location, then combine - ## them using the FIS aggregation method. + ## If adjacent rows represent singletons at the same location, then + ## combine them using the FIS aggregation method. for i = 1 : rows (mult_singletons) - 1 if (mult_singletons(i, 1) == mult_singletons(i+1, 1)) @@ -129,16 +131,18 @@ endif endfor - ## Return the transpose of the matrix after removing 0-height singletons. + ## Return the transpose of the matrix after removing 0-height + ## singletons. mult_singletons = (remove_null_rows (mult_singletons))'; endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Function: remove_null_rows -## Purpose: Return the argument without the rows with a 0 in the second column. -##------------------------------------------------------------------------------ +## Purpose: Return the argument without the rows with a 0 in the +## second column. +##---------------------------------------------------------------------- function y = remove_null_rows (x) y = []; Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_mf_params.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_mf_params.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_mf_params.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -32,7 +32,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: are_mf_params.m -## Last-Modified: 19 May 2011 +## Last-Modified: 20 Aug 2012 function y = are_mf_params (type, params) @@ -55,11 +55,12 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = real_vector (params) ## -## Return 1 if params is a vector of real numbers, and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of real numbers, and +## return 0 otherwise. +##---------------------------------------------------------------------- function y = real_vector (params) @@ -67,11 +68,12 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = two_reals (params) ## -## Return 1 if params is a vector of 2 real numbers, and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 2 real numbers, and +## return 0 otherwise. +##---------------------------------------------------------------------- function y = two_reals (params) @@ -79,11 +81,12 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = three_reals (params) ## -## Return 1 if params is a vector of 3 real numbers, and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 3 real numbers, and +## return 0 otherwise. +##---------------------------------------------------------------------- function y = three_reals (params) @@ -91,11 +94,12 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = four_reals (params) ## -## Return 1 if params is a vector of 4 real numbers, and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 4 real numbers, and +## return 0 otherwise. +##---------------------------------------------------------------------- function y = four_reals (params) @@ -103,13 +107,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = gbellmf_params (params) ## y = gbellmf_params ([a b c]) ## -## Return 1 if params is a vector of 3 real numbers, [a b c], with a != 0 and -## integral-valued b, and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 3 real numbers, [a b c], with +## a != 0 and integral-valued b, and return 0 otherwise. +##---------------------------------------------------------------------- function y = gbellmf_params (params) @@ -117,13 +121,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = pimf_params (params) ## y = pimf_params ([a b c d]) ## ## Return 1 if params is a vector of 4 real numbers, [a b c d], with ## a < b <= c < d, and return 0 otherwise. -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- function y = pimf_params (params) @@ -134,13 +138,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = smf_params (params) ## y = smf_params ([a b]) ## ## Return 1 if params is a vector of 2 real numbers, [a b], with a < b, ## and return 0 otherwise. -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- function y = smf_params (params) @@ -148,13 +152,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = trapmf_params (params) ## y = trapmf_params ([a b c d]) ## ## Return 1 if params is a vector of 4 real numbers, [a b c d], with ## a < b <= c < d, and return 0 otherwise. -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- function y = trapmf_params (params) @@ -165,13 +169,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = trimf_params (params) ## y = trimf_params ([a b c]) ## -## Return 1 if params is a vector of 3 real numbers, [a b c], with a < b < c, -## and return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 3 real numbers, [a b c], with +## a < b < c, and return 0 otherwise. +##---------------------------------------------------------------------- function y = trimf_params (params) @@ -181,13 +185,13 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Usage: y = zmf_params (params) ## y = zmf_params ([a b]) ## -## Return 1 if params is a vector of 2 real numbers, [a b], with a < b, and -## return 0 otherwise. -##------------------------------------------------------------------------------ +## Return 1 if params is a vector of 2 real numbers, [a b], with a < b, +## and return 0 otherwise. +##---------------------------------------------------------------------- function y = zmf_params (params) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_mamdani.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_mamdani.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_mamdani.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -64,14 +64,14 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: defuzzify_output_mamdani.m -## Last-Modified: 30 Aug 2011 +## Last-Modified: 20 Aug 2012 function output = defuzzify_output_mamdani (fis, fuzzy_output) - num_outputs = columns (fis.output); ## num_outputs == L (above) + num_outputs = columns (fis.output); ## num_outputs == L (above) num_points = rows (fuzzy_output); output = zeros (1, num_outputs); Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_sugeno.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_sugeno.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/defuzzify_output_sugeno.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -64,10 +64,10 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: defuzzify_output_sugeno.m -## Last-Modified: 29 Aug 2011 +## Last-Modified: 20 Aug 2012 function output = defuzzify_output_sugeno (fis, aggregated_output) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_firing_strength.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_firing_strength.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_firing_strength.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -57,27 +57,27 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: eval_firing_strength.m -## Last-Modified: 3 Nov 2011 +## Last-Modified: 20 Aug 2012 function firing_strength = eval_firing_strength (fis, rule_input) - num_rules = columns (fis.rule); ## num_rules == Q (above) - num_inputs = columns (fis.input); ## num_inputs == N + num_rules = columns (fis.rule); ## num_rules == Q (above) + num_inputs = columns (fis.input); ## num_inputs == N ## Initialize output matrix to prevent inefficient resizing. firing_strength = zeros (1, num_rules); ## For each rule - ## 1. Apply connection to find matching degree of the rule antecedent. + ## 1. Apply connection to find matching degree of the antecedent. ## 2. Multiply by weight of the rule to find degree of the rule. for i = 1 : num_rules rule = fis.rule(i); - ## Collect mu values for all input variables in the rule's antecedent. + ## Collect mu values for all input variables in the antecedent. antecedent_mus = []; for j = 1 : num_inputs if (rule.antecedent(j) != 0) @@ -94,33 +94,47 @@ endif switch (connect) case 'min' - firing_strength(i) = rule.weight * min (antecedent_mus); + firing_strength(i) = rule.weight * ... + min (antecedent_mus); case 'max' - firing_strength(i) = rule.weight * max (antecedent_mus); + firing_strength(i) = rule.weight * ... + max (antecedent_mus); case 'prod' - firing_strength(i) = rule.weight * prod (antecedent_mus); + firing_strength(i) = rule.weight * ... + prod (antecedent_mus); case 'sum' - firing_strength(i) = rule.weight * sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + sum (antecedent_mus); case 'algebraic_product' - firing_strength(i) = rule.weight * prod (antecedent_mus); + firing_strength(i) = rule.weight * ... + prod (antecedent_mus); case 'algebraic_sum' - firing_strength(i) = rule.weight * algebraic_sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + algebraic_sum (antecedent_mus); case 'bounded_difference' - firing_strength(i) = rule.weight * bounded_difference (antecedent_mus); + firing_strength(i) = rule.weight * ... + bounded_difference (antecedent_mus); case 'bounded_sum' - firing_strength(i) = rule.weight * bounded_sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + bounded_sum (antecedent_mus); case 'einstein_product' - firing_strength(i) = rule.weight * einstein_product (antecedent_mus); + firing_strength(i) = rule.weight * ... + einstein_product (antecedent_mus); case 'einstein_sum' - firing_strength(i) = rule.weight * einstein_sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + einstein_sum (antecedent_mus); case 'hamacher_product' - firing_strength(i) = rule.weight * hamacher_product (antecedent_mus); + firing_strength(i) = rule.weight * ... + hamacher_product (antecedent_mus); case 'hamacher_sum' - firing_strength(i) = rule.weight * hamacher_sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + hamacher_sum (antecedent_mus); case 'drastic_product' - firing_strength(i) = rule.weight * drastic_product (antecedent_mus); + firing_strength(i) = rule.weight * ... + drastic_product (antecedent_mus); case 'drastic_sum' - firing_strength(i) = rule.weight * drastic_sum (antecedent_mus); + firing_strength(i) = rule.weight * ... + drastic_sum (antecedent_mus); otherwise firing_strength(i) = rule.weight * ... str2func (connect) (antecedent_mus); Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_mamdani.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_mamdani.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_mamdani.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -64,15 +64,16 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: eval_rules_mamdani.m -## Last-Modified: 1 Nov 2011 +## Last-Modified: 20 Aug 2012 -function rule_output = eval_rules_mamdani (fis, firing_strength, num_points) +function rule_output = eval_rules_mamdani (fis, firing_strength, ... + num_points) - num_rules = columns (fis.rule); ## num_rules == Q (above) - num_outputs = columns (fis.output); ## num_outputs == L + num_rules = columns (fis.rule); ## num_rules == Q (above) + num_outputs = columns (fis.output); ## num_outputs == L ## Initialize output matrix to prevent inefficient resizing. rule_output = zeros (num_points, num_rules*num_outputs); @@ -91,11 +92,12 @@ ## Compute the fuzzy output for this (rule, output) pair. - [mf_index hedge not_flag] = get_mf_index_and_hedge (rule.consequent(j)); + [mf_index hedge not_flag] = ... + get_mf_index_and_hedge (rule.consequent(j)); if (mf_index != 0) - ## First, get the fuzzy output, adjusting for the hedge and not_flag, - ## but not for the rule matching degree. + ## First, get the fuzzy output, adjusting for the hedge and + ## not_flag, but not for the rule matching degree. range = fis.output(j).range; mf = fis.output(j).mf(mf_index); @@ -110,8 +112,8 @@ case 'prod' fuzzy_out *= rule_matching_degree; otherwise - fuzzy_out = str2func (fis.impMethod) (rule_matching_degree, ... - fuzzy_out); + fuzzy_out = str2func (fis.impMethod) ... + (rule_matching_degree, fuzzy_out); endswitch ## Store result in column of rule_output corresponding Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_sugeno.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_sugeno.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/eval_rules_sugeno.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -61,29 +61,30 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: eval_rules_sugeno.m -## Last-Modified: 1 Nov 2011 +## Last-Modified: 20 Aug 2012 -function rule_output = eval_rules_sugeno (fis, firing_strength, user_input) +function rule_output = eval_rules_sugeno (fis, firing_strength, ... + user_input) - num_rules = columns (fis.rule); ## num_rules == Q (above) - num_outputs = columns (fis.output); ## num_outputs == L + num_rules = columns (fis.rule); ## num_rules == Q (above) + num_outputs = columns (fis.output); ## num_outputs == L ## Initialize output matrix to prevent inefficient resizing. rule_output = zeros (2, num_rules * num_outputs); ## Compute the (location, height) of the singleton output by each ## (rule, output) pair: - ## 1. The height is given by the firing strength of the rule, and by - ## the hedge and the not flag for the (rule, output) pair. + ## 1. The height is given by the firing strength of the rule, and + ## by the hedge and the not flag for the (rule, output) pair. ## 2. If the consequent membership function is constant, then the - ## membership function's parameter gives the location of the singleton. - ## If the consequent membership function is linear, then the - ## location is the inner product of the the membership function's - ## parameters and the vector formed by appending a 1 to the user input - ## vector. + ## membership function's parameter gives the location of the + ## singleton. If the consequent membership function is linear, + ## then the location is the inner product of the the membership + ## function's parameters and the vector formed by appending a 1 + ## to the user input vector. for i = 1 : num_rules rule = fis.rule(i); @@ -93,10 +94,12 @@ for j = 1 : num_outputs ## Compute the singleton height for this (rule, output) pair. - ## Note that for Sugeno FISs, the hedge and not flag are handled by - ## adjusting the height of the singletons for each (rule, output) pair. + ## Note that for Sugeno FISs, the hedge and not flag are handled + ## by adjusting the height of the singletons for each + ## (rule, output) pair. - [mf_index hedge not_flag] = get_mf_index_and_hedge (rule.consequent(j)); + [mf_index hedge not_flag] = ... + get_mf_index_and_hedge (rule.consequent(j)); height = rule_firing_strength; if (hedge != 0) height = height ^ (1 / hedge); Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalfis_private.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalfis_private.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalfis_private.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -31,10 +31,10 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: evalfis_private.m -## Last-Modified: 19 May 2011 +## Last-Modified: 20 Aug 2012 function [output, rule_input, rule_output, fuzzy_output] = ... evalfis_private (user_input, fis, num_points = 101) @@ -51,11 +51,13 @@ rule_input = fuzzify_input (fis, user_input(i, :)); firing_strength = eval_firing_strength (fis, rule_input); if (strcmp (fis.type, 'mamdani')) - rule_output = eval_rules_mamdani (fis, firing_strength, num_points); + rule_output = eval_rules_mamdani (fis, firing_strength, ... + num_points); fuzzy_output = aggregate_output_mamdani (fis, rule_output); output(i, :) = defuzzify_output_mamdani (fis, fuzzy_output); else - rule_output = eval_rules_sugeno (fis, firing_strength, user_input(i, :)); + rule_output = eval_rules_sugeno (fis, firing_strength, ... + user_input(i, :)); fuzzy_output = aggregate_output_sugeno (fis, rule_output); output(i, :) = defuzzify_output_sugeno (fis, fuzzy_output); endif Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -34,14 +34,16 @@ ## Keywords: fuzzy-logic-toolkit fuzzy membership-function evaluate ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: evalmf_private.m -## Last-Modified: 2 Nov 2011 +## Last-Modified: 20 Aug 2012 -function y = evalmf_private (x, params, mf_type, hedge = 0, not_flag = false) +function y = evalmf_private (x, params, mf_type, hedge = 0, ... + not_flag = false) ## Calculate and return the y values of the membership function on - ## the domain x. First, get the value of the membership function without - ## correcting for the hedge and not_flag. Then, for non-linear functions, - ## adjust the function values for non-zero hedge and not_flag. + ## the domain x. First, get the value of the membership function + ## without correcting for the hedge and not_flag. Then, for non-linear + ## functions, adjust the function values for non-zero hedge and + ## not_flag. switch (mf_type) case 'constant' @@ -65,11 +67,12 @@ endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Function: eval_constant -## Purpose: Return the y-values corresponding to the x-values in the domain -## for the constant function specified by the parameter c. -##------------------------------------------------------------------------------ +## Purpose: Return the y-values corresponding to the x-values in +## the domain for the constant function specified by the +## parameter c. +##---------------------------------------------------------------------- function y = eval_constant (x, c) y = zeros (length (x)); @@ -78,16 +81,17 @@ y = arrayfun (y_val, x); endfunction -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Function: eval_linear -## Purpose: For the parameters [a ... c]), return the y-values corresponding -## to the linear function y = a*x + c, where x takes on the the -## x-values in the domain. The remaining coefficients in the parameter -## list are not used -- this creates a two-dimensional intersection of -## the linear output membership function suitable for display together -## with other membership functions, but does not fully represent the -## output membership function. -##------------------------------------------------------------------------------ +## Purpose: For the parameters [a ... c]), return the y-values +## corresponding to the linear function y = a*x + c, where x +## takes on the the x-values in the domain. The remaining +## coefficients in the parameter list are not used -- this +## creates a two-dimensional intersection of the linear output +## membership function suitable for display together with +## other membership functions, but does not fully represent +## the output membership function. +##---------------------------------------------------------------------- function y = eval_linear (x, params) if (length (params) == 1) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_convergence_criterion.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_convergence_criterion.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_convergence_criterion.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2012 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -27,12 +27,13 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm private +## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fcm_compute_convergence_criterion.m -## Last-Modified: 7 July 2012 +## Last-Modified: 20 Aug 2012 -function convergence_criterion = fcm_compute_convergence_criterion (V, V_previous) +function convergence_criterion = ... + fcm_compute_convergence_criterion (V, V_previous) V_delta = V - V_previous; convergence_criterion = sum (sqrt (sum (V_delta .* V_delta)')); Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_objective_fcn.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_objective_fcn.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_compute_objective_fcn.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2012 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -26,16 +26,17 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm private +## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fcm_compute_objective_fcn.m -## Last-Modified: 7 July 2012 +## Last-Modified: 20 Aug 2012 -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Note: This function is an implementation of Equation 13.3 in -## Fuzzy Logic: Intelligence, Control and Information, by J. Yen and -## R. Langari, Prentice Hall, 1999, page 379 (International Edition). -##------------------------------------------------------------------------------ +## Fuzzy Logic: Intelligence, Control and Information, by +## J. Yen and R. Langari, Prentice Hall, 1999, page 379 +## (International Edition). +##---------------------------------------------------------------------- function obj_fcn = fcm_compute_objective_fcn (Mu_m, sqr_dist) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_init_prototype.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_init_prototype.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_init_prototype.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2012 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -27,10 +27,10 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm private +## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fcm_init_prototype.m -## Last-Modified: 7 July 2012 +## Last-Modified: 20 Aug 2012 function V = fcm_init_prototype (X, k) @@ -40,8 +40,8 @@ V = rand (k, num_features); for i = 1 : num_features - V(:, i) = (max_feature_value(i) - min_feature_value(i)) * V(:, i) + ... - min_feature_value(i); + V(:, i) = (max_feature_value(i) - min_feature_value(i)) * ... + V(:, i) + min_feature_value(i); endfor endfunction Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_cluster_centers.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_cluster_centers.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_cluster_centers.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2012 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -27,16 +27,17 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm private +## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fcm_update_cluster_centers.m -## Last-Modified: 7 July 2012 +## Last-Modified: 20 Aug 2012 -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Note: This function is an implementation of Equation 13.5 in -## Fuzzy Logic: Intelligence, Control and Information, by J. Yen and -## R. Langari, Prentice Hall, 1999, page 380 (International Edition). -##------------------------------------------------------------------------------ +## Fuzzy Logic: Intelligence, Control and Information, by +## J. Yen and R. Langari, Prentice Hall, 1999, page 380 +## (International Edition). +##---------------------------------------------------------------------- function V = fcm_update_cluster_centers (Mu_m, X, k) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_membership_fcn.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_membership_fcn.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fcm_update_membership_fcn.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2012 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -26,18 +26,19 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm private +## Keywords: fuzzy-logic-toolkit fuzzy partition clustering fcm ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fcm_update_membership_fcn.m -## Last-Modified: 7 July 2012 +## Last-Modified: 20 Aug 2012 -##------------------------------------------------------------------------------ +##---------------------------------------------------------------------- ## Note: This function is an implementation of Equation 13.4 in -## Fuzzy Logic: Intelligence, Control and Information, by J. Yen and -## R. Langari, Prentice Hall, 1999, page 380 (International Edition) -## and Step 3 of Algorithm 4.1 in Fuzzy and Neural Control, -## by Robert Babuska, November 2009, p. 63. -##------------------------------------------------------------------------------ +## Fuzzy Logic: Intelligence, Control and Information, by +## J. Yen and R. Langari, Prentice Hall, 1999, page 380 +## (International Edition) and Step 3 of Algorithm 4.1 in +## Fuzzy and Neural Control, by Robert Babuska, November 2009, +## p. 63. +##---------------------------------------------------------------------- function Mu = fcm_update_membership_fcn (V, X, m, k, n, sqr_dist) @@ -54,7 +55,7 @@ if (summation != 0) Mu(i, j) = 1.0 / summation; else - error ("division by 0 in function fcm_update_membership_fcn'\n"); + error ("division by 0 in fcm_update_membership_fcn'\n"); endif endfor endfor @@ -69,7 +70,7 @@ endif endfor endfor - Mu = Mu / num_zeros; ## Does this need to be randomized? + Mu = Mu / num_zeros; endif endfunction Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fuzzify_input.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fuzzify_input.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/fuzzify_input.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -62,18 +62,19 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: fuzzify_input.m -## Last-Modified: 1 Nov 2011 +## Last-Modified: 20 Aug 2012 function rule_input = fuzzify_input (fis, user_input) - num_rules = columns (fis.rule); ## num_rules == Q (above) - num_inputs = columns (fis.input); ## num_inputs == N - rule_input = zeros (num_rules, num_inputs); ## init to prevent resizing + num_rules = columns (fis.rule); ## num_rules == Q (above) + num_inputs = columns (fis.input); ## num_inputs == N + rule_input = zeros (num_rules, num_inputs); ## to prevent resizing - ## For each rule i and each input j, compute the value of mu in the result. + ## For each rule i and each input j, compute the value of mu + ## in the result. for i = 1 : num_rules antecedent = fis.rule(i).antecedent; @@ -81,9 +82,11 @@ mu = 0; crisp_x = user_input(j); - ## Get the value of mu (with adjustment for the hedge and not_flag). + ## Get the value of mu (with adjustment for the hedge + ## and not_flag). - [mf_index hedge not_flag] = get_mf_index_and_hedge (antecedent(j)); + [mf_index hedge not_flag] = ... + get_mf_index_and_hedge (antecedent(j)); if (mf_index != 0) mf = fis.input(j).mf(mf_index); mu = evalmf (crisp_x, mf.params, mf.type, hedge, not_flag); Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/get_mf_index_and_hedge.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/get_mf_index_and_hedge.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/get_mf_index_and_hedge.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -33,14 +33,16 @@ ## @end deftypefn ## Author: L. Markowsky -## Keywords: fuzzy-logic-toolkit fuzzy fuzzy-inference-system fis +## Keywords: fuzzy-logic-toolkit fuzzy inference system fis ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: get_mf_index_and_hedge.m -## Last-Modified: 12 Nov 2011 +## Last-Modified: 20 Aug 2012 -function [mf_index hedge not_flag] = get_mf_index_and_hedge (mf_index_and_hedge) +function [mf_index hedge not_flag] = ... + get_mf_index_and_hedge (mf_index_and_hedge) - ## Set flag to handle "not", indicated by a minus sign in the antecedent. + ## Set flag to handle "not", indicated by a minus sign in the + ## antecedent. if (mf_index_and_hedge < 0) not_flag = true; @@ -55,9 +57,10 @@ mf_index = fix (mf_index_and_hedge); ## For custom hedges and the four built-in hedges "somewhat", "very", - ## "extremely", and "very very", return the power to which the membership - ## value should be raised. The hedges are indicated by the fractional - ## part of the corresponding rule_matrix entry (rounded to 2 digits). + ## "extremely", and "very very", return the power to which the + ## membership value should be raised. The hedges are indicated by the + ## fractional part of the corresponding rule_matrix entry (rounded to + ## 2 digits). if (mf_index != 0) hedge = round (100 * (mf_index_and_hedge - mf_index)) / 10; Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_input_matrix.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_input_matrix.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_input_matrix.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## @@ -29,11 +29,12 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_input_matrix.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_input_matrix (x, fis) - if (!(ismatrix (x) && isreal (x) && (columns (x) == columns (fis.input)))) + if (!(ismatrix (x) && isreal (x) && ... + (columns (x) == columns (fis.input)))) y = 0; else y = 1; Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m 2012-08-24 16:11:37 UTC (rev 10908) @@ -1,4 +1,4 @@ -## Copyright (C) 2011 L. Markowsky <lm...@us...> +## Copyright (C) 2011-2012 L. Markowsky <lm...@us...> ## ## This file is part of the fuzzy-logic-toolkit. ## Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m 2012-08-24 15:45:12 UTC (rev 10907) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/priva... [truncated message content] |
From: <lm...@us...> - 2012-10-03 00:37:25
|
Revision: 11096 http://octave.svn.sourceforge.net/octave/?rev=11096&view=rev Author: lmarkov Date: 2012-10-03 00:37:18 +0000 (Wed, 03 Oct 2012) Log Message: ----------- M private/square_distance_matrix.m M private/is_mf_struct.m M private/is_string.m M private/is_domain.m M private/is_builtin_language.m M private/evalmf_private.m M private/is_var_index.m M private/is_fis.m M private/is_real.m M private/is_io_vector.m M private/are_input_indices.m M private/is_rule_vector.m M private/is_ref_input.m M private/is_grid_spec.m M private/is_real_matrix.m M private/is_io_struct.m M private/is_pos_int.m M private/is_rule_struct.m M private/is_mf_vector.m M private/are_bounds.m M private/is_output_index.m M private/is_format.m M private/is_mf_index.m M private/is_row_vector.m M private/is_rule_index_list.m M private/is_int.m Modified Paths: -------------- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real_matrix.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_ref_input.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_row_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_index_list.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_struct.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_vector.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_string.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_var_index.m trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/square_distance_matrix.m Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_bounds.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -32,7 +32,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: are_bounds.m -## Last-Modified: 19 May 2011 +## Last-Modified: 20 Aug 2012 function y = are_bounds (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/are_input_indices.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -29,7 +29,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: are_input_indices.m -## Last-Modified: 19 May 2011 +## Last-Modified: 20 Aug 2012 function y = are_input_indices (x, fis) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/evalmf_private.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -18,8 +18,8 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {@var{y} =} evalmf_private (@var{x}, @var{param}, @var{mf_type}) -## @deftypefn {Function File} {@var{y} =} evalmf_private (@var{x}, @var{param}, @var{mf_type}, @var{hedge}) -## @deftypefn {Function File} {@var{y} =} evalmf_private (@var{x}, @var{param}, @var{mf_type}, @var{hedge}, @var{not_flag}) +## @deftypefnx {Function File} {@var{y} =} evalmf_private (@var{x}, @var{param}, @var{mf_type}, @var{hedge}) +## @deftypefnx {Function File} {@var{y} =} evalmf_private (@var{x}, @var{param}, @var{mf_type}, @var{hedge}, @var{not_flag}) ## @deftypefnx {Function File} {@var{y} =} evalmf_private (@var{[x1 x2 ... xn]}, @var{[param1 ... ]}, '<@var{mf_type}>') ## @deftypefnx {Function File} {@var{y} =} evalmf_private (@var{[x1 x2 ... xn]}, @var{[param1 ... ]}, '<@var{mf_type}>', @var{hedge}) ## @deftypefnx {Function File} {@var{y} =} evalmf_private (@var{[x1 x2 ... xn]}, @var{[param1 ... ]}, '<@var{mf_type}>', @var{hedge}, @var{not_flag}) @@ -34,7 +34,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy membership-function evaluate ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: evalmf_private.m -## Last-Modified: 20 Aug 2012 +## Last-Modified: 3 Sep 2012 function y = evalmf_private (x, params, mf_type, hedge = 0, ... not_flag = false) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_builtin_language.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -17,14 +17,14 @@ ## see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{y} =} is_language (@var{x}) +## @deftypefn {Function File} {@var{y} =} is_builtin_language (@var{x}) ## ## Return 1 if @var{x} is one of the strings representing the ## built-in languages, and return 0 otherwise. The comparison is ## case-insensitive. ## -## is_language is a private function that localizes the test for -## languages handled by showrule. +## is_builtin_language is a private function that localizes the test +## for languages handled by showrule. ## ## @end deftypefn @@ -32,7 +32,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_builtin_language.m -## Last-Modified: 4 Nov 2011 +## Last-Modified: 3 Sep 2012 function y = is_builtin_language (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_domain.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -32,7 +32,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_domain.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_domain (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_fis.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -47,7 +47,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_fis.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_fis (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_format.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -31,7 +31,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_format.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_format (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_grid_spec.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -28,7 +28,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_grid_spec.m -## Last-Modified: 28 Aug 2011 +## Last-Modified: 20 Aug 2012 function y = is_grid_spec (x, fis) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_int.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -42,7 +42,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_int.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_int (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_struct.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -33,7 +33,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_io_struct.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_io_struct (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_io_vector.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -31,7 +31,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_io_vector.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_io_vector (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_index.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -37,7 +37,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_mf_index.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_mf_index (fis, in_or_out, var_index, mf_index) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_struct.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -33,7 +33,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_mf_struct.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_mf_struct (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_mf_vector.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -30,7 +30,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_mf_vector.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_mf_vector (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_output_index.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -28,7 +28,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_output_index.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_output_index (x, fis) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_pos_int.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -39,7 +39,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_pos_int.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_pos_int (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -43,7 +43,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_real.m -## Last-Modified: 4 Nov 2011 +## Last-Modified: 20 Aug 2012 function y = is_real (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real_matrix.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real_matrix.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_real_matrix.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -40,7 +40,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_real_matrix.m -## Last-Modified: 4 Nov 2011 +## Last-Modified: 20 Aug 2012 function y = is_real_matrix (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_ref_input.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_ref_input.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_ref_input.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -28,7 +28,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_ref_input.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_ref_input (x, fis, graphed_inputs) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_row_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_row_vector.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_row_vector.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -36,7 +36,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_row_vector.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_row_vector (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_index_list.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_index_list.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_index_list.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -41,7 +41,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_rule_index_list.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_rule_index_list (x, max_index) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_struct.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_struct.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_struct.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -33,7 +33,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_rule_struct.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_rule_struct (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_vector.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_vector.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_rule_vector.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -31,7 +31,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_rule_vector.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_rule_vector (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_string.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_string.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_string.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -33,7 +33,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_string.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_string (x) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_var_index.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_var_index.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/is_var_index.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -35,7 +35,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private parameter-test ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: is_var_index.m -## Last-Modified: 20 May 2011 +## Last-Modified: 20 Aug 2012 function y = is_var_index (fis, in_or_out, var_index) Modified: trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/square_distance_matrix.m =================================================================== --- trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/square_distance_matrix.m 2012-10-01 10:34:50 UTC (rev 11095) +++ trunk/octave-forge/main/fuzzy-logic-toolkit/inst/private/square_distance_matrix.m 2012-10-03 00:37:18 UTC (rev 11096) @@ -32,7 +32,7 @@ ## Keywords: fuzzy-logic-toolkit fuzzy private ## Directory: fuzzy-logic-toolkit/inst/private/ ## Filename: square_dist_matrix.m -## Last-Modified: 12 Apr 2012 +## Last-Modified: 20 Aug 2012 function sqr_dist = square_distance_matrix (X, V) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |