Skip to content

Commit a23e0bf

Browse files
bradbellbradbell
committed
master: change GetPar() -> par_ptr(), GetPar(i) -> par_one(i).
1 parent 1b2ace8 commit a23e0bf

17 files changed

+76
-64
lines changed

‎include/cppad/core/abs_normal_fun.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ void ADFun<Base,RecBase>::abs_normal_fun(ADFun& g, ADFun& a) const
399399
size_t j_par = 0;
400400
# endif
401401
// value of this parameter
402-
Base par = play_.GetPar(i_par);
402+
Base par = play_.par_one(i_par);
403403
if( ! par_is_dyn[i_par] )
404404
CPPAD_J_PAR_EQUAL_REC.put_con_par(par);
405405
else

‎include/cppad/core/graph/to_graph.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void CppAD::ADFun<Base,RecBase>::to_graph(
103103
graph_obj.n_variable_ind_set(n_variable_ind);
104104
//
105105
// value of parameters
106-
const Base* parameter = play_.GetPar();
106+
const Base* parameter = play_.par_ptr();
107107
//
108108
// number of variables
109109
const size_t n_variable = play_.num_var_rec();

‎include/cppad/local/op_code_var.hpp

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_OP_CODE_VAR_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77
# include <string>
88
# include <sstream>
@@ -754,11 +754,11 @@ void printOp(
754754
if( arg[1] & 1 )
755755
printOpField(os, " vl=", arg[2], ncol);
756756
else
757-
printOpField(os, " pl=", play->GetPar( size_t(arg[2]) ), ncol);
757+
printOpField(os, " pl=", play->par_one( size_t(arg[2]) ), ncol);
758758
if( arg[1] & 2 )
759759
printOpField(os, " vr=", arg[3], ncol);
760760
else
761-
printOpField(os, " pr=", play->GetPar( size_t(arg[3]) ), ncol);
761+
printOpField(os, " pr=", play->par_one( size_t(arg[3]) ), ncol);
762762
if( size_t(arg[4]) < 3 )
763763
{ for(addr_t i = 0; i < arg[4]; i++)
764764
printOpField(os, " ot=", arg[6+i], ncol);
@@ -794,21 +794,21 @@ void printOp(
794794
arg[arg[4]] = arg[4]
795795
*/
796796
CPPAD_ASSERT_UNKNOWN( arg[arg[4]] == arg[4] );
797-
printOpField(os, " pr=", play->GetPar( size_t(arg[0]) ), ncol);
797+
printOpField(os, " pr=", play->par_one( size_t(arg[0]) ), ncol);
798798
for(addr_t i = 5; i < arg[1]; i++)
799799
printOpField(os, " +v=", arg[i], ncol);
800800
for(addr_t i = arg[1]; i < arg[2]; i++)
801801
printOpField(os, " -v=", arg[i], ncol);
802802
for(addr_t i = arg[2]; i < arg[3]; i++)
803-
printOpField(os, " +d=", play->GetPar( size_t(arg[i]) ), ncol);
803+
printOpField(os, " +d=", play->par_one( size_t(arg[i]) ), ncol);
804804
for(addr_t i = arg[3]; i < arg[4]; i++)
805-
printOpField(os, " -d=", play->GetPar( size_t(arg[i]) ), ncol);
805+
printOpField(os, " -d=", play->par_one( size_t(arg[i]) ), ncol);
806806
break;
807807

808808
case LdpOp:
809809
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 3 );
810810
printOpField(os, "off=", arg[0], ncol);
811-
printOpField(os, " p=", play->GetPar( size_t(arg[1]) ), ncol);
811+
printOpField(os, " p=", play->par_one( size_t(arg[1]) ), ncol);
812812
break;
813813

814814
case LdvOp:
@@ -820,22 +820,22 @@ void printOp(
820820
case StppOp:
821821
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 3 );
822822
printOpField(os, "off=", arg[0], ncol);
823-
printOpField(os, " pl=", play->GetPar( size_t(arg[1]) ), ncol);
824-
printOpField(os, " pr=", play->GetPar( size_t(arg[2]) ), ncol);
823+
printOpField(os, " pl=", play->par_one( size_t(arg[1]) ), ncol);
824+
printOpField(os, " pr=", play->par_one( size_t(arg[2]) ), ncol);
825825
break;
826826

827827
case StpvOp:
828828
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 3 );
829829
printOpField(os, "off=", arg[0], ncol);
830-
printOpField(os, " p=", play->GetPar( size_t(arg[1]) ), ncol);
830+
printOpField(os, " p=", play->par_one( size_t(arg[1]) ), ncol);
831831
printOpField(os, " v=", arg[2], ncol);
832832
break;
833833

834834
case StvpOp:
835835
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 3 );
836836
printOpField(os, "off=", arg[0], ncol);
837837
printOpField(os, " v=", arg[1], ncol);
838-
printOpField(os, " p=", play->GetPar( size_t(arg[2]) ), ncol);
838+
printOpField(os, " p=", play->par_one( size_t(arg[2]) ), ncol);
839839
break;
840840

841841
case StvvOp:
@@ -871,7 +871,7 @@ void printOp(
871871
case PowpvOp:
872872
case ZmulpvOp:
873873
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 2 );
874-
printOpField(os, " pl=", play->GetPar( size_t(arg[0]) ), ncol);
874+
printOpField(os, " pl=", play->par_one( size_t(arg[0]) ), ncol);
875875
printOpField(os, " vr=", arg[1], ncol);
876876
break;
877877

@@ -883,7 +883,7 @@ void printOp(
883883
case ZmulvpOp:
884884
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 2 );
885885
printOpField(os, " vl=", arg[0], ncol);
886-
printOpField(os, " pr=", play->GetPar( size_t(arg[1]) ), ncol);
886+
printOpField(os, " pr=", play->par_one( size_t(arg[1]) ), ncol);
887887
break;
888888

889889
case AbsOp:
@@ -923,7 +923,7 @@ void printOp(
923923
case FunapOp:
924924
case FunrpOp:
925925
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 1 );
926-
printOpField(os, " p=", play->GetPar( size_t(arg[0]) ), ncol);
926+
printOpField(os, " p=", play->par_one( size_t(arg[0]) ), ncol);
927927
break;
928928

929929
case AFunOp:
@@ -948,12 +948,12 @@ void printOp(
948948
if( arg[0] & 1 )
949949
printOpField(os, " v=", arg[1], ncol);
950950
else
951-
printOpField(os, " p=", play->GetPar( size_t(arg[1]) ), ncol);
951+
printOpField(os, " p=", play->par_one( size_t(arg[1]) ), ncol);
952952
os << "before=\"" << play->GetTxt( size_t(arg[2]) ) << "\"";
953953
if( arg[0] & 2 )
954954
printOpField(os, " v=", arg[3], ncol);
955955
else
956-
printOpField(os, " p=", play->GetPar( size_t(arg[3]) ), ncol);
956+
printOpField(os, " p=", play->par_one( size_t(arg[3]) ), ncol);
957957
os << "after=\"" << play->GetTxt( size_t(arg[4]) ) << "\"";
958958
break;
959959

@@ -983,28 +983,28 @@ void printOp(
983983
if( arg[1] & 1 )
984984
printOpField(os, " vl=", arg[2], ncol);
985985
else
986-
printOpField(os, " pl=", play->GetPar( size_t(arg[2]) ), ncol);
986+
printOpField(os, " pl=", play->par_one( size_t(arg[2]) ), ncol);
987987
if( arg[1] & 2 )
988988
printOpField(os, " vr=", arg[3], ncol);
989989
else
990-
printOpField(os, " pr=", play->GetPar( size_t(arg[3]) ), ncol);
990+
printOpField(os, " pr=", play->par_one( size_t(arg[3]) ), ncol);
991991
if( arg[1] & 4 )
992992
printOpField(os, " vt=", arg[4], ncol);
993993
else
994-
printOpField(os, " pt=", play->GetPar( size_t(arg[4]) ), ncol);
994+
printOpField(os, " pt=", play->par_one( size_t(arg[4]) ), ncol);
995995
if( arg[1] & 8 )
996996
printOpField(os, " vf=", arg[5], ncol);
997997
else
998-
printOpField(os, " pf=", play->GetPar( size_t(arg[5]) ), ncol);
998+
printOpField(os, " pf=", play->par_one( size_t(arg[5]) ), ncol);
999999
break;
10001000

10011001
case EqppOp:
10021002
case LeppOp:
10031003
case LtppOp:
10041004
case NeppOp:
10051005
CPPAD_ASSERT_UNKNOWN( NumArg(op) == 2 );
1006-
printOpField(os, " pl=", play->GetPar( size_t(arg[0]) ), ncol);
1007-
printOpField(os, " pr=", play->GetPar( size_t(arg[1]) ), ncol);
1006+
printOpField(os, " pl=", play->par_one( size_t(arg[0]) ), ncol);
1007+
printOpField(os, " pr=", play->par_one( size_t(arg[1]) ), ncol);
10081008
break;
10091009

10101010
default:

‎include/cppad/local/optimize/get_op_usage.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void get_op_usage(
296296
size_t num_par = play->num_par_rec();
297297
# endif
298298
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
299-
const Base* parameter = play->GetPar();
299+
const Base* parameter = play->par_ptr();
300300
// -----------------------------------------------------------------------
301301
// vecad information
302302
size_t num_vecad = play->num_var_vecad_rec();

‎include/cppad/local/optimize/optimize_run.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,14 @@ bool optimize_run(
328328
rec->set_record_compare( compare_op );
329329

330330
// copy parameters with index 0
331-
CPPAD_ASSERT_UNKNOWN( ! par_is_dyn[0] && CppAD::isnan( play->GetPar(0) ) );
332-
rec->put_con_par( play->GetPar(0) );
331+
CPPAD_ASSERT_UNKNOWN( ! par_is_dyn[0] && CppAD::isnan( play->par_one(0) ) );
332+
rec->put_con_par( play->par_one(0) );
333333
new_par[0] = 0;
334334

335335
// set new_par for the independent dynamic parameters
336336
for(size_t i_par = 1; i_par <= n_dyn_independent; i_par++)
337337
{ CPPAD_ASSERT_UNKNOWN( par_is_dyn[i_par] );
338-
addr_t i = rec->put_dyn_par(play->GetPar(i_par), ind_dyn);
338+
addr_t i = rec->put_dyn_par(play->par_one(i_par), ind_dyn);
339339
CPPAD_ASSERT_UNKNOWN( size_t(i) == i_par );
340340
new_par[i_par] = i;
341341
}
@@ -346,7 +346,7 @@ bool optimize_run(
346346
{ CPPAD_ASSERT_UNKNOWN( i_par == 0 || n_dyn_independent < i_par );
347347
if( par_usage[i_par] )
348348
{ // value of this parameter
349-
Base par = play->GetPar(i_par);
349+
Base par = play->par_one(i_par);
350350
new_par[i_par] = rec->put_con_par(par);
351351
}
352352
}
@@ -419,7 +419,7 @@ bool optimize_run(
419419
CPPAD_ASSERT_UNKNOWN( par_is_dyn[res_i] || res_i == 0 );
420420
//
421421
if( par_is_dyn[res_i] )
422-
{ Base par = play->GetPar( size_t(res_i) );
422+
{ Base par = play->par_one( size_t(res_i) );
423423
if( first_dynamic_result )
424424
{ first_dynamic_result = false;
425425
new_par[res_i] = rec->put_dyn_par(par, atom_dyn);
@@ -452,7 +452,7 @@ bool optimize_run(
452452
else
453453
{
454454
// value of this parameter
455-
Base par = play->GetPar(i_par);
455+
Base par = play->par_one(i_par);
456456
//
457457
if( op == cond_exp_dyn )
458458
{ // cond_exp_dyn

‎include/cppad/local/optimize/record_csum.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct_size_pair record_csum(
108108
// vector of length npar containing the parameters the old operation
109109
// sequence; i.e., given a parameter index i < npar, the corresponding
110110
// parameter value is par[i].
111-
const Base* par = play->GetPar();
111+
const Base* par = play->par_ptr();
112112

113113
// which parameters are dynamic
114114
const pod_vector<bool>& par_is_dyn( play->par_is_dyn() );

‎include/cppad/local/play/dyn_player.hpp

+20-10
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,18 @@ corresponding index in the vector of all the parameters.
9191
// END_DYN2PAR_INDEX
9292
}
9393
94-
GetPar
95-
******
94+
par_ptr
95+
*******
9696
{xrst_literal
97-
// BEGIN_GETPAR
98-
// END_GETPAR
97+
// BEGIN_PAR_PTR
98+
// END_PAR_PTR
99+
}
100+
101+
par_one
102+
*******
103+
{xrst_literal
104+
// BEGIN_PAR_ONE
105+
// END_PAR_ONE
99106
}
100107
101108
par_value
@@ -386,14 +393,17 @@ template <class Base> class dyn_player {
386393
{ return dyn_par_arg_; }
387394
// END_DYN_ARG_ALL
388395
//
389-
// BEGIN_GETPAR
390-
// par_value = dyn_play.GetPar(i)
391-
// par_ptr = dyn_play.GetPar()
392-
Base GetPar(size_t i) const
396+
// BEGIN_PAR_ONE
397+
// par_one = dyn_play.par_one(i)
398+
Base par_one(size_t i) const
399+
// END_PAR_ONE
393400
{ return par_all_[i]; }
394-
const Base* GetPar(void) const
401+
//
402+
// BEGIN_PAR_PTR
403+
// par_ptr = dyn_play.par_ptr()
404+
const Base* par_ptr(void) const
405+
// END_PAR_PTR
395406
{ return par_all_.data(); }
396-
// END_GETPAR
397407
//
398408
// BEGIN_N_DYN_INDEPENDENT
399409
// n_dyn_independent

‎include/cppad/local/play/player.hpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -660,11 +660,13 @@ class player {
660660
size_t GetVecInd (size_t i) const
661661
{ return size_t( var_vecad_ind_[i] ); }
662662
//
663-
// GetPar
664-
Base GetPar(size_t i) const
665-
{ return dyn_play_.GetPar(i); }
666-
const Base* GetPar(void) const
667-
{ return dyn_play_.GetPar(); }
663+
// par_one
664+
Base par_one(size_t i) const
665+
{ return dyn_play_.par_one(i); }
666+
//
667+
// par_ptr
668+
const Base* par_ptr(void) const
669+
{ return dyn_play_.par_ptr(); }
668670
//
669671
// GetTxt
670672
/*!

‎include/cppad/local/sweep/for_hes.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_SWEEP_FOR_HES_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77

88
# include <cppad/local/play/atom_op_info.hpp>
@@ -210,7 +210,7 @@ void for_hes(
210210
// pointer to the beginning of the parameter vector
211211
// (used by atomic functions)
212212
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
213-
const Base* parameter = play->GetPar();
213+
const Base* parameter = play->par_ptr();
214214
//
215215
// skip the BeginOp at the beginning of the recording
216216
play::const_sequential_iterator itr = play->begin();

‎include/cppad/local/sweep/for_jac.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_SWEEP_FOR_JAC_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77

88
# include <set>
@@ -133,7 +133,7 @@ void for_jac(
133133
// pointer to the beginning of the parameter vector
134134
// (used by atomic functions)
135135
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
136-
const Base* parameter = play->GetPar();
136+
const Base* parameter = play->par_ptr();
137137
//
138138
# if CPPAD_FOR_JAC_TRACE
139139
std::cout << std::endl;

‎include/cppad/local/sweep/forward_0.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_SWEEP_FORWARD_0_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77

88
# include <cppad/local/play/atom_op_info.hpp>
@@ -105,7 +105,7 @@ void forward_0(
105105

106106
// pointer to the beginning of the parameter vector
107107
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
108-
const Base* parameter = play->GetPar();
108+
const Base* parameter = play->par_ptr();
109109

110110
// length of the text vector (used by CppAD assert macros)
111111
const size_t num_text = play->num_text_rec();

‎include/cppad/local/sweep/forward_any.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_SWEEP_FORWARD_ANY_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77

88
# include <cppad/local/play/atom_op_info.hpp>
@@ -114,7 +114,7 @@ void forward_any(
114114

115115
// pointer to the beginning of the parameter vector
116116
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
117-
const Base* parameter = play->GetPar();
117+
const Base* parameter = play->par_ptr();
118118

119119
// length of the text vector (used by CppAD assert macros)
120120
const size_t num_text = play->num_text_rec();

‎include/cppad/local/sweep/forward_dir.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# define CPPAD_LOCAL_SWEEP_FORWARD_DIR_HPP
33
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
44
// SPDX-FileCopyrightText: Bradley M. Bell <[email protected]>
5-
// SPDX-FileContributor: 2003-24 Bradley M. Bell
5+
// SPDX-FileContributor: 2003-25 Bradley M. Bell
66
// ----------------------------------------------------------------------------
77

88
# include <cppad/local/play/atom_op_info.hpp>
@@ -75,7 +75,7 @@ void forward_dir(
7575

7676
// pointer to the beginning of the parameter vector
7777
CPPAD_ASSERT_UNKNOWN( num_par > 0 )
78-
const Base* parameter = play->GetPar();
78+
const Base* parameter = play->par_ptr();
7979

8080
// temporary indices
8181
size_t i;

0 commit comments

Comments
 (0)