Sylvestre Ledru [Tue, 12 Mar 2013 14:26:49 +0000]
The default example of xgrid shows a white image. Switch to a real example
Change-Id: Ia2631d65ca1915766e77f51861b695fc1149d363
Calixte DENIZET [Tue, 12 Mar 2013 13:47:27 +0000]
Help generation: improve images management (use md5 rather than timestamp)
Change-Id: Ia804eaa71ea88dd8af6bb7f0fa86e8ef9a8107c8
Simon Marchetto [Tue, 12 Mar 2013 13:31:26 +0000]
nonreg_test for bug #12229
Change-Id: I29becff070f882e989cc48b75e764df493e655b2
Simon Marchetto [Tue, 12 Mar 2013 11:38:45 +0000]
* Bug #8649 fixed : Basename help page is not clear on the argument flag and flagexpand.
Fix: rewrite help for flags, flagexpand arguments in basename & dirname macros
+ fix basename & dirname examples
Change-Id: I25c51a895ac1fd9fa38883aeff8ad0f8d6dcf203
Sylvestre Ledru [Tue, 12 Mar 2013 12:56:34 +0000]
Document the commit
73b05c0ec38f90ff8ab275d76126c2ed405e260d
Change-Id: I4ef6930405ed3803742b038967a11f9d060ca7b5
Sylvestre Ledru [Tue, 12 Mar 2013 11:43:08 +0000]
Workaround for the Mac OS X usage of umfpack
Change-Id: I618494ddbcd00fbd44f4c4b5a33c98be3abea9d6
Vincent COUVERT [Tue, 12 Mar 2013 10:01:36 +0000]
nbLines is not a pointer ==> do not free
Change-Id: I45891811c2e224f00dddb379992da03efbdeed82
Simon Marchetto [Tue, 12 Mar 2013 10:54:39 +0000]
* Bug #12360 fixed - Incorrect format for purely real complexs in csvWrite.
Fix: do not display imaginary part on purely real complexs,
& real part on purely imaginary complexs
+ add unit test complex data
Change-Id: I38ba3d83cba3b884350bd07ceb3bb33281498cde
Vincent COUVERT [Tue, 12 Mar 2013 10:45:26 +0000]
Properties are now of type int and no more char*
Change-Id: I4308327b196d5073f3ce45967b107c8ee42b5398
Vincent COUVERT [Tue, 12 Mar 2013 08:59:51 +0000]
Use FREE instead of free for memory allocated by MALLOC
Change-Id: I7f5ebdb0b828808f43eab7c63c69bdb40ff4c6da
Vincent COUVERT [Tue, 12 Mar 2013 08:36:26 +0000]
Fix test after https://codereview.scilab.org/#/c/10711/
To test: test_run("optimization", "bug_8726");
Change-Id: Ida350403ffa8df3c563d59905e80c28321dfc74d
Sylvestre Ledru [Mon, 11 Mar 2013 16:14:39 +0000]
Rename the variable in the cheb2mag function. It was overriding a Scilab function Improve the example.
Change-Id: Ia957602080c696b2a129d1f0bc49fb217fce91f7
Vincent COUVERT [Mon, 11 Mar 2013 15:52:54 +0000]
Fix a warning / Variable error
Change-Id: Ied7564ca2143d86c5e3b9e03e4b64ec3e98ca51b
Calixte DENIZET [Mon, 11 Mar 2013 10:21:13 +0000]
Bug 12374 fixed: unexpected mark was drawn with xsegs
Change-Id: I13a3919501063226d237f6f2c39ca3a242d1889d
Calixte DENIZET [Mon, 11 Mar 2013 10:41:55 +0000]
Fix weird and not reproductible exception on Scilab close
Change-Id: Ide2239be5d359ddf40e437aec68ebff1a70b6839
Vincent COUVERT [Mon, 11 Mar 2013 10:30:54 +0000]
Fix test now fprintf is obsolete.
To test: test_run("output_stream", "bug_6682")
Change-Id: I4bf00ce5991eb94ad42a11173c415cef138e0282
Vincent COUVERT [Mon, 11 Mar 2013 10:24:41 +0000]
Force order of compilation in genlib to ensure tests execution.
To test: test_run("modules_manager")
Change-Id: I485bde2bf56ebca3d724ee646fd75bd36e7e683f
Vincent COUVERT [Mon, 11 Mar 2013 09:34:47 +0000]
Update test to use assert_checkalmostequal on several tests (needed for Linux 32bit were mean diff was 4.441D-16).
To test: test_run("linear_algebra", "bug_10178")
Change-Id: Id9c8ea38adb994d6a33a52b301c79d1da9ce4cf0
Vincent COUVERT [Fri, 8 Mar 2013 16:12:59 +0000]
* Bug #12361 fixed - Error fixed in replot() help page examples.
Change-Id: Iddc62d154dbef1360aba515dd55ae1711bf780c1
Calixte DENIZET [Mon, 11 Mar 2013 08:33:15 +0000]
Bug 12378 fixed: sdf() crashed Scilab
Change-Id: I6699cae774954a9c8d20971f07745712da1254ec
Sylvestre Ledru [Sun, 10 Mar 2013 18:48:58 +0000]
Fix a bug in the exemple in the brazilian help page
Change-Id: I7c0e9d1c387278d2b1b6091ac0f92fb97711ed62
Sylvestre Ledru [Sun, 10 Mar 2013 18:22:25 +0000]
* Bug #12377 fixed - chepol was located in the wrong help section
(now in polynomial).
Change-Id: Ic188383221da27ed197bb2b2a16a06748e47163f
Sylvestre Ledru [Sun, 10 Mar 2013 17:55:06 +0000]
Add non reg test for bug 12373: pmodulo(n,m<0) returned a negative result.
Change-Id: I3e31205eedbd72109add181f5035fe268d972b12
Samuel GOUGEON [Sun, 10 Mar 2013 17:09:30 +0000]
* Bug #12373 fixed - pmodulo(n,m<0) returned a negative result.
Change-Id: I0c32a19dd266fd83c826f7aff47d5fda1ee74aa4
Charlotte HECQUET [Wed, 6 Mar 2013 10:52:21 +0000]
* Bug #12111 fixed - karmarkar function did not generate appropriate warnings.
Change-Id: I6e68e705a676cbdcc3c348a7310bec38cdea82cd
Sylvestre Ledru [Fri, 8 Mar 2013 16:47:31 +0000]
If the option show_error is passed to test_run, it will also export stderr into the xml file
Example:
test_run("graphic_objects","bug_11472","show_error","/tmp/foo.xml")
Change-Id: I2e5012e66c8461b24f75562901701c7f40f55beb
Samuel GOUGEON [Fri, 8 Mar 2013 17:00:03 +0000]
* variance is now vectorized and allows the syntax variance(x,"*",w).
See bug #12362
Translation into French of the variance help page
Change-Id: I891328b07d336c90019e05c6425275d4aa7af446
Sylvestre Ledru [Fri, 8 Mar 2013 20:17:09 +0000]
Touch fake files to make the code coverage happy
Change-Id: I2e7b7415fbf90f16f4a9304dffc971e6d6b82c9e
Michaël Baudin [Fri, 8 Mar 2013 16:21:37 +0000]
Improve the documentation on blackslash & slash
Change-Id: I2873051ae08f0b591f3dcbc7a50c9d80d03123e0
Simon Marchetto [Wed, 6 Mar 2013 17:38:25 +0000]
* Bug #12134 fixed: default stacksize is incorrect
Change-Id: I719324f9405111241cfe5e6b055a27e6edea3b7c
Michaël Baudin [Fri, 8 Mar 2013 15:43:51 +0000]
* Bug #9196 fixed - The threshold level for conditioning in backslash and slash
were too small.
Change-Id: Ibd0b17766a1d92a89e4d2bcd68cca038aab862a4
Vincent COUVERT [Fri, 8 Mar 2013 15:18:56 +0000]
Try to give more information in case of error
For example:
a = [1,2,3,4,5];
assert_checkequal(variance(a + a*%i),5)
=>
assert_checkequal: Assertion failed: expected = 5 while computed = 5 (mean diff = 8.882D-16)
Change-Id: I4439c6bc2e4efb5b70ad946ef0db7eba087cb98b
Sylvestre Ledru [Fri, 8 Mar 2013 14:53:05 +0000]
* Bug #12243 fixed - parellel_run did not run all calculations on 8 core
processors.
Change-Id: I4cd1beaaa7288262a56ca059a5f4a7f0da04a479
Samuel GOUGEON [Wed, 6 Mar 2013 07:51:54 +0000]
* Bug #11209 fixed - variance returned wrong results for complex arguments.
Change-Id: Idccae872be60ef42af6f29b093404aee181758a5
Simon Marchetto [Thu, 7 Mar 2013 16:27:46 +0000]
* Bug #12144 fixed - csvRead triggers some errors about memory.
if range column/row left indice is greater than column/row count, return error:
"Range row or/and column left indice(s) out of bounds"
(if right indice is out of bound, no error but truncate)
+ move csvRead bug_#353 test to dedicated range unit test
+ centralization: temp objects releasing (releaseObjects), range cheking (getRangeSize)
Change-Id: I7d4a0ca25bf9bdaaaf7b8e296e47e0486c9953ee
Sylvestre Ledru [Fri, 8 Mar 2013 14:33:19 +0000]
The wrong OpenMP CXXFLAGS was used (it was using OPENMP_CPPFLAGS instead of OPENMP_CXXFLAGS
As a side effect, it should fix the Mac OS X build too.
Change-Id: Ib62cf298d85aa8c6b7bbde83609f3938dd58a2a8
Vincent COUVERT [Fri, 8 Mar 2013 13:45:23 +0000]
Add a test to check compiler used
Change-Id: I4ea5f2b8cc1eb8468afb3157b73202457dde90ba
Clément DAVID [Fri, 1 Mar 2013 13:08:25 +0000]
Xcos code generation: log the uid into the call comment
Change-Id: I89101ca844cec1ca025c294b9e7aaa3dfc49d797
Antoine ELIAS [Mon, 4 Mar 2013 14:10:47 +0000]
move bug fix in good section
Change-Id: I118b6e52b201c9473cd6de99b56d59e6397a7a14
Vincent COUVERT [Fri, 8 Mar 2013 12:51:56 +0000]
* winclose() tagged as obsolete. Will be removed for Scilab 5.5.0.
Use close() instead.
* Remove references in examples.
Change-Id: I426a9769ebae8da5280b7d466bc86a623fcc5f3b
Paul BIGNIER [Thu, 7 Mar 2013 15:14:50 +0000]
Typo fixes
Change-Id: I403b94624a67a99089f9d663e71b2726842c2f54
Charlotte HECQUET [Thu, 7 Mar 2013 10:41:45 +0000]
* Bug #11924 fixed - winclose() was not tagged as obsolete.
Change-Id: I8d8266caa022b5a3480c27059e78f7068225ac9d
Michaël Baudin [Wed, 6 Mar 2013 08:10:21 +0000]
* Bug #9196 fixed - The threshold level for conditioning in backslash was too
small.
Change-Id: Ie0056d871047b63092542e73c19da0a609cb963b
Cedric Delamarre [Fri, 8 Mar 2013 11:17:47 +0000]
documentation of znaupd and zneupd corrected.
Change-Id: I1a9c99d344777dea11f25a542c23743ed622ecbe
Calixte DENIZET [Thu, 21 Feb 2013 14:54:02 +0000]
Bug 5478 fixed: Scilab could not be started with a non readable/writeable SCIHOME
Change-Id: If7ce900097e51da6eceb117e412d77c8f35b4909
Clément DAVID [Wed, 6 Mar 2013 12:11:55 +0000]
* Bug #12352 fixed - Critical error when closing a scope windows during
simulation fixed.
Change-Id: If7fc9432c2780b2dea08213ba6e61a680fd59a66
Sylvestre Ledru [Fri, 8 Mar 2013 10:45:31 +0000]
Move the levels in the code coverage 90 => 85 & 75 => 70
Change-Id: Ia8b08889e7bd451541e5d0d01c5361fefb20f459
Cedric Delamarre [Fri, 8 Mar 2013 10:44:53 +0000]
tests about znaupd corrected.
Change-Id: If7b02b0bfbf455d51afdbc429064bcb7b9b0be61
Calixte DENIZET [Thu, 7 Mar 2013 10:33:03 +0000]
Bug 11944 fixed: In SciNotes, untabify several lines did not work correctly.
Change-Id: I946bac88da00513bb623e458cb7a1380d3931e91
Sylvestre Ledru [Thu, 7 Mar 2013 18:16:45 +0000]
Remove some useless code
Change-Id: I4937a9ccbc0a55effa9dc9bcc3281bd59fb25ce9
Calixte DENIZET [Tue, 5 Mar 2013 16:06:53 +0000]
GO: improve Axes accessors
Change-Id: I415ac149c6b33950f34b1868e1a9e33359ed86b4
Vincent COUVERT [Fri, 8 Mar 2013 07:37:15 +0000]
Fix incompatible operands comparison
Change-Id: I0c7a0d44c7f0b3e46fa8a13bc7f0457eb00b5a20
Samuel GOUGEON [Wed, 6 Mar 2013 15:53:38 +0000]
* Bug #5576 fixed - interp() help page has been improved.
Change-Id: I39e2e987ed7735b709475a739b33d226bd21602c
Charlotte HECQUET [Tue, 5 Mar 2013 13:54:25 +0000]
* Bug #12335 fixed - strtod didn't work with negative numbers.
+ manage sign '+' and '-' and form with '.' without zero like .3 or -.5 ( compatible with strtod C function )
Change-Id: I50993dd8363759a77e18eb2f8d196a1f4a3bfdf4
Calixte DENIZET [Thu, 7 Mar 2013 13:49:13 +0000]
Bug 12234 fixed: Graphics could crash with an invalid property
Change-Id: Id7d8b5bacaf30cda1abb4ca6b478872c75799fc7
Sylvestre Ledru [Thu, 7 Mar 2013 13:51:17 +0000]
Improve the order of declaration (the --enable-force-full-link option was breaking the graphic features)
Change-Id: I5f201db02cfa383b94019b87492eef16b99d190c
Sylvestre Ledru [Wed, 6 Mar 2013 10:13:23 +0000]
Rename directories to change the order on the online help page help.scilab.org/
Change-Id: Ib511c479a86b825b9b6091a59a408a46e7ad0b6f
Calixte DENIZET [Thu, 7 Mar 2013 10:08:31 +0000]
Bug 12354 fixed: In SciNotes, invalid function with a semicolon after args declaration
Change-Id: Ib2712d377995057f38b05988fe297b569d21a910
Simon Marchetto [Wed, 6 Mar 2013 15:23:09 +0000]
elementary_functions: regression test for bug #9844 (sum return wrong values)
Change-Id: Iac9f345c96da046f524d34f2e0746336c98caa63
Charlotte HECQUET [Thu, 7 Mar 2013 08:06:15 +0000]
* Bug #12122 fixed - Help page of lufact did not specify that lufact doesn't handle complex matrix.
Change-Id: Ide444ccd197238b47e9fa73e8fa7587d33447051
Sylvestre Ledru [Wed, 6 Mar 2013 17:23:03 +0000]
Add a new option to the configure to force the link of all Scilab libraries. This will avoid bugs like bugzilla.scilab.org/show_bug.cgi?id=12133 (undefined symbol which can be seen only at runtime)
+ do some minor cleanup
This is also interesting for the code coverage (it will help him to know
that these libraries are Scilab code)
Change-Id: I5e5f0a3e336b9c1f6a01ed30ca8fdd416fee268d
Sylvestre Ledru [Wed, 6 Mar 2013 17:21:48 +0000]
* Bug #12133 fixed - parallel_run was not available.
Change-Id: If28681a54ef7241758c11d60a8780237951db884
Clément DAVID [Wed, 6 Mar 2013 16:03:58 +0000]
Signal processing help: render some plot to illustrate the help page
Change-Id: I6f5571018e0797fd28e61a855154e486c3439419
Bruno JOFRET [Wed, 6 Mar 2013 13:18:44 +0000]
Force tab closure to be performed by EDT.
Change-Id: I118f2a28e743639e1c36af1a5d92608f704b335b
Antoine ELIAS [Fri, 1 Mar 2013 14:56:18 +0000]
Fix bug 11639 : unistall removed ALL scilab registry information.
set LASTINSTALL key to most recent version already installed.
Change-Id: Ie3c2083cd712e8fd9f9a78de49e42135f212f504
Antoine ELIAS [Wed, 6 Mar 2013 11:26:13 +0000]
winqueryreg can list subkey with argument "key"
Change-Id: If1a301103fd66a9461be4ec49ed7a468f0f8c1c9
Sylvestre Ledru [Wed, 6 Mar 2013 09:33:52 +0000]
Remove some useless variable declarations
Change-Id: Icb5ae3d234e87e9f1ef1146d6e850ec6deafb7d1
Sylvestre Ledru [Mon, 4 Mar 2013 16:19:02 +0000]
In case of error in the gateway number, provide a better error message
Change-Id: Ie6ff6a4a1045c5520f7672e8a6d8746b06677671
Bruno JOFRET [Wed, 6 Mar 2013 08:29:47 +0000]
If no history file is given through prefs, create a default one.
Change-Id: Ic89f52916e5529d57aa3559ea6313baa5a27ebcc
Clément DAVID [Tue, 5 Mar 2013 15:37:14 +0000]
* Bug #12351 fixed - "Save as" a diagram to a selected xcos file type, saved
it as zcos.
Change-Id: I70e9dad73964726222788d3c350577bdda150cde
Charlotte HECQUET [Fri, 1 Mar 2013 16:26:08 +0000]
* Bug #12291 fixed - Unable to display a list of handle as an handle userData.
Change-Id: Ib660b8e6caa3ad85e1123ea4557b9a2fa1e5cf95
Calixte DENIZET [Tue, 5 Mar 2013 17:31:17 +0000]
Bug 4946 fixed: Bad rendering of big rotated label
Change-Id: I2bfff213ece12d3ab5030ce37aae0c5c1761e483
Calixte DENIZET [Tue, 5 Mar 2013 19:58:41 +0000]
Bug 11362 fixed: imprecision in axes_properties doc about mark_style=mark_size=0
Change-Id: I43dbebd15486c8dbfc8048d639a661020836eec7
Simon Marchetto [Tue, 5 Mar 2013 16:24:09 +0000]
* Bug #6975 fixed: Scilab's xlabel(),ylabel(),zlabel() functions are undocumented.
xlabel documentation rewritten, particularly:
- graphic handle parameter documented
- label properties detailed
- example and image fixed
Change-Id: Ib3b042572756a46c2731a76ed00703daa993bb12
Stanislav KROTER [Tue, 5 Mar 2013 14:14:32 +0000]
Changed russian help page for modulo after commit
067227d1fd13493ff3c0b2b3afdd516d244d3803.
Change-Id: I207814a572429991727e4bbd5ab983220385c79a
Vincent COUVERT [Tue, 5 Mar 2013 07:51:45 +0000]
First input argument of modulo can also be a polynomial.
To test: test_run("polynomials", "bug_201")
Change-Id: If7bca785c6b63d76733c4455da85853f99083049
Simon Marchetto [Tue, 5 Mar 2013 11:13:49 +0000]
* Bug #12333 fixed - Cleaned command history is restored after reopening Scilab.
fix:
- on all platforms history file name is now SCIHOME/history
- retrieve everywhere history file path from preferences
+ remove wrong comments about history filename
Change-Id: I9c9ec856f88230ca293004900bc3c79979282e0c
Cedric Delamarre [Tue, 5 Mar 2013 08:54:52 +0000]
Two tests had the same name in arnoldi module.
Change-Id: I9d99e90fe0c2e6034ba446db77bea017646da30f
Antoine ELIAS [Mon, 4 Mar 2013 15:31:27 +0000]
add wrapper entry points to allow toolboxes to not link against core.lib instead of MALLOC.lib
Change-Id: I5aa0bde6ab7d95a9e783919b3bf79ef93b3926b6
Charlotte HECQUET [Mon, 4 Mar 2013 14:52:37 +0000]
* Bug #12348 fixed - surf() disable lines(n) if there is no input variable.
Change-Id: I506cfdd14a514364891e3b733ac541e8e1076fbb
Vincent COUVERT [Mon, 4 Mar 2013 16:20:49 +0000]
Missing file in binary versions
Change-Id: Icc3cea20533269ff667692a2b72e44ec2ac6a0d6
Bruno JOFRET [Mon, 4 Mar 2013 12:47:00 +0000]
Fix clear behaviour on Linux 64b.
Change-Id: I81f5f3b6baef20328521862d4802a47e682cc5d7
Bruno JOFRET [Mon, 4 Mar 2013 08:38:52 +0000]
Fix modulo call on non-double datatype. Add unitary test.
Change-Id: Ibf8ee1fa1c07a13aa7820f32e9bfd0bea2b97813
Vincent COUVERT [Mon, 4 Mar 2013 12:19:17 +0000]
This library has been removed
Change-Id: I2553e18bba92175b8a73ed5ebabfb821219d9ecb
Sylvestre Ledru [Mon, 4 Mar 2013 11:10:08 +0000]
Fix a typo in the documentation
Change-Id: Icdf94736778c729ce82d1315905fb04e3be1e2a3
Samuel GOUGEON [Mon, 4 Mar 2013 11:02:16 +0000]
* Bug #12346 fixed - lsslist() help pages were mislocated. Moved now to CACSD.
Change-Id: I31cf24ebce36705886377b3772c75e96a55c83e7
Alexandre HERISSE [Wed, 27 Feb 2013 15:37:41 +0000]
* Bug #11871 fixed - Connectors were misaligned after Undo command.
Change-Id: I1b055b7b2b8c6109c5eb389a2d1d20552273338b
Alexandre HERISSE [Wed, 27 Feb 2013 13:57:54 +0000]
* Bug #10435 fixed - Undo in superdiagram did not update superblock ports
and links.
Change-Id: Ie3893b1f01de67960bb3b77795e3f94c083c294c
Charlotte HECQUET [Wed, 6 Feb 2013 17:03:23 +0000]
* Bug #12059 fixed - Index returned by gsort of sparse were wrong.
Change-Id: I1ff44f0737f53166672281174479140758bca627
Vincent COUVERT [Mon, 4 Mar 2013 08:25:42 +0000]
Remove references to MALLOC.lib + old useless Makefile.in
Change-Id: I9ffdef90238ecd5c5754b1b42ae940a8780441fa
Vincent COUVERT [Thu, 28 Feb 2013 21:43:46 +0000]
Update help page after https://codereview.scilab.org/#/c/10467/
Change-Id: Ief2358999581b765e805a0be1c6ff6b3f79505fe
Stanislav KROTER [Mon, 4 Mar 2013 07:09:21 +0000]
Fixed a typo.
Change-Id: I3f3e052812d99047d0b83979c3c8e4bd869da985
Calixte DENIZET [Fri, 22 Feb 2013 10:26:16 +0000]
Scinotes: show a messagebox when an external modif has been made on the current file
Change-Id: I6ad2e0c841ac2f637caca9541a2e05e1e2d55738
Stanislav KROTER [Fri, 1 Mar 2013 14:26:33 +0000]
Removed "Sfgrayplot demo:" from demo of Sfgrayplot.
The main reason to do this was localization (this phrase was not localized).
Besides, demos of many other function have no explanation that "it is a demo".
Change-Id: I3a6829b799d03eae2ae997f03d9c2152138671a6
Stanislav KROTER [Fri, 1 Mar 2013 00:57:25 +0000]
Fixed the title on ndgrid image.
Change-Id: I493ac2f200f8ae095ecda85e2299e5756598fbc3
Charlotte HECQUET [Thu, 7 Feb 2013 13:52:59 +0000]
* Bug #12174 fixed - The function "routh_t" gave incorrect output for all denominators
that include gain value "k".
Change-Id: I490b1dabdd130266314b647c1f97439acd1f17fd
Bruno JOFRET [Mon, 11 Feb 2013 15:03:58 +0000]
* Bug #9935 fixed - clear() does not clear all variables.
Change-Id: I8caae906a77fd23f6cd0d09d1da2a0387a2ffe3f
Bruno JOFRET [Thu, 14 Feb 2013 09:55:43 +0000]
* Bug #9934 fixed - clear([["A","B"]) returns a non standard error message.
Change-Id: I813cda8b3257928366e6b4d05fe2547e6122034e
Bruno JOFRET [Thu, 14 Feb 2013 09:14:15 +0000]
* Bug #10278 fixed - clear(1) returns a wrong error message.
Change-Id: I7e9eb99047211a0dc1ae5eab03a0eb9fda667d3e
Bruno JOFRET [Fri, 1 Mar 2013 10:08:45 +0000]
* Fix BUG #12317 Eventhandler and keyboard events
* Avoid NPE when closing a figure using shortcut CTRL+W and the eventhandler tried to update the infobar.
Change-Id: I20a0452df49d6ea29445c5ae4254eb32c7df7d8e