Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix copy-paste in code generator #157

Merged
merged 1 commit into from
Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/.vuepress/components/skdecide-codegen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<span class="token keyword">class</span> <template v-if="isSolver"><span class="token class-name">MySolver</span>({{ solverInheritance }}):
T_domain <span class="token operator">=</span> D</template><template v-else><span class="token class-name">MyDomain</span>(D):</template>
<template v-for="[characteristic, level] in Object.entries({...{'default': domainOrSolver}, ...selection[domainOrSolver].characteristics}).filter(([k, v]) => v != '(none)')"><template v-for="method in methods[domainOrSolver][level]">
<span class="token keyword">def</span> <span class="token function">{{method}}</span>(<template v-for="p, i in signatures[method].params">{{p.name}}<template v-if="p.annotation">: {{adaptAnnotation(p.annotation)}}</template><span v-show="p.default"> <span class="token operator">=</span> <span class="token boolean">{{p.default}}</span></span><span v-show="i < signatures[method].params.length - 1">, </span></template>)<template v-if="signatures[method].return"> <span class="token operator">-></span> {{adaptAnnotation(signatures[method].return)}}</template>:
<span class="token keyword">def</span> <span class="token function">{{method}}</span>(<template v-for="p, i in signatures[method].params">{{p.name}}<template v-if="p.annotation">: {{adaptAnnotation(p.annotation)}}</template><template v-if="p.default"> <span class="token operator">=</span> <span class="token boolean">{{p.default}}</span></template><template v-if="i < signatures[method].params.length - 1">, </template></template>)<template v-if="signatures[method].return"> <span class="token operator">-></span> {{adaptAnnotation(signatures[method].return)}}</template>:
<span class="token keyword">pass</span>
</template></template>
</code>
Expand Down
7 changes: 6 additions & 1 deletion docs/autodoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,12 @@ def add_func_method_infos(func_method, autodoc):
for k, v in parameters.items():
if not (k == "self" and func_method.__name__ == "__init__"):
parameter = parameters[k]
param = {"name": k}
if parameter.kind == inspect.Parameter.VAR_POSITIONAL:
param = {"name": "*" + k}
elif parameter.kind == inspect.Parameter.VAR_KEYWORD:
param = {"name": "**" + k}
else:
param = {"name": k}
if parameter.default != signature.empty:
param["default"] = str(parameter.default)
if "lambda" in param["default"]:
Expand Down