Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Brice Videau
CCS
Commits
98fff1b4
Commit
98fff1b4
authored
Sep 24, 2020
by
Brice Videau
Browse files
Allow symbols to be used for hyperparameter names in Ruby.
parent
0beb7360
Changes
2
Hide whitespace changes
Inline
Side-by-side
bindings/ruby/lib/cconfigspace/expression_parser.rb
View file @
98fff1b4
...
...
@@ -53,7 +53,7 @@ module CCS
Literal
::
new
(
value:
Float
(
num
))
}
rule
(
:integer
=>
Regexp
.
new
(
TerminalRegexp
[
:CCS_TERM_INTEGER
])).
as
{
|
num
|
Literal
::
new
(
value:
Integer
(
num
))
}
rule
(
:identifier
=>
Regexp
.
new
(
TerminalRegexp
[
:CCS_TERM_IDENTIFIER
])
).
as
{
|
identifier
|
rule
(
:identifier
=>
/[:a-zA-Z_][a-zA-Z_0-9]*/
).
as
{
|
identifier
|
Variable
::
new
(
hyperparameter:
context
.
hyperparameter_by_name
(
identifier
))
}
rule
(
:string
=>
Regexp
.
new
(
TerminalRegexp
[
:CCS_TERM_STRING
])).
as
{
|
str
|
Literal
::
new
(
value:
eval
(
str
))
}
...
...
bindings/ruby/lib/cconfigspace/hyperparameter.rb
View file @
98fff1b4
...
...
@@ -60,7 +60,9 @@ module CCS
ptr
=
MemoryPointer
::
new
(
:pointer
)
res
=
CCS
.
ccs_hyperparameter_get_name
(
@handle
,
ptr
)
CCS
.
error_check
(
res
)
ptr
.
read_pointer
.
read_string
r
=
ptr
.
read_pointer
.
read_string
r
=
r
.
sub
(
/^:/
,
""
).
to_sym
if
r
.
match
(
/^:/
)
r
end
end
...
...
@@ -143,6 +145,7 @@ module CCS
else
raise
CCSError
,
:CCS_INVALID_TYPE
end
name
=
name
.
inspect
if
name
.
kind_of?
(
Symbol
)
res
=
CCS
.
ccs_create_numerical_hyperparameter
(
name
,
data_type
,
lower
,
upper
,
quantization
,
default
,
user_data
,
ptr
)
CCS
.
error_check
(
res
)
super
(
ptr
.
read_pointer
,
retain:
false
)
...
...
@@ -218,6 +221,7 @@ module CCS
vals
=
MemoryPointer
::
new
(
:ccs_datum_t
,
count
)
values
.
each_with_index
{
|
v
,
i
|
Datum
::
new
(
vals
[
i
]).
value
=
v
}
ptr
=
MemoryPointer
::
new
(
:ccs_hyperparameter_t
)
name
=
name
.
inspect
if
name
.
kind_of?
(
Symbol
)
res
=
CCS
.
ccs_create_categorical_hyperparameter
(
name
,
count
,
vals
,
default_index
,
user_data
,
ptr
)
CCS
.
error_check
(
res
)
super
(
ptr
.
read_ccs_hyperparameter_t
,
retain:
false
)
...
...
@@ -251,6 +255,7 @@ module CCS
vals
=
MemoryPointer
::
new
(
:ccs_datum_t
,
count
)
values
.
each_with_index
{
|
v
,
i
|
Datum
::
new
(
vals
[
i
]).
value
=
v
}
ptr
=
MemoryPointer
::
new
(
:ccs_hyperparameter_t
)
name
=
name
.
inspect
if
name
.
kind_of?
(
Symbol
)
res
=
CCS
.
ccs_create_ordinal_hyperparameter
(
name
,
count
,
vals
,
default_index
,
user_data
,
ptr
)
CCS
.
error_check
(
res
)
super
(
ptr
.
read_ccs_hyperparameter_t
,
retain:
false
)
...
...
@@ -292,6 +297,7 @@ module CCS
vals
=
MemoryPointer
::
new
(
:ccs_datum_t
,
count
)
values
.
each_with_index
{
|
v
,
i
|
Datum
::
new
(
vals
[
i
]).
value
=
v
}
ptr
=
MemoryPointer
::
new
(
:ccs_hyperparameter_t
)
name
=
name
.
inspect
if
name
.
kind_of?
(
Symbol
)
res
=
CCS
.
ccs_create_discrete_hyperparameter
(
name
,
count
,
vals
,
default_index
,
user_data
,
ptr
)
CCS
.
error_check
(
res
)
super
(
ptr
.
read_ccs_hyperparameter_t
,
retain:
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment