update set_shape method

This commit is contained in:
wyq 2019-12-08 09:22:03 +08:00
parent 40e8bc89c5
commit 0570016c10
5 changed files with 171 additions and 164 deletions

View File

@ -146,6 +146,6 @@
<orderEntry type="library" name="Maven: de.sciss:docking-frames-common:2.0.0" level="project" />
<orderEntry type="library" name="Maven: de.sciss:docking-frames-core:2.0.0" level="project" />
<orderEntry type="library" name="Maven: com.fifesoft:autocomplete:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fifesoft:rsyntaxtextarea:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fifesoft:rsyntaxtextarea:3.0.4" level="project" />
</component>
</module>

View File

@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\satellite\himawari">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\stats"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\random"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\fitting"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\hdf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\scatter">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\micaps"/>
@ -16,17 +8,31 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\verification"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite\himawari"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\classification"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\regression"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\turtle"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\scatter"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\traj_4.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\model_selection\train_test_split_2.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\classification\tree_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\turtle\paint_1.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\turtle\paint_2.py"/>
<OpenedFile File=""/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\traj_4.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\model_selection\train_test_split_2.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\classification\tree_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\turtle\paint_1.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\turtle\paint_2.py"/>
<RecentFile File=""/>
</RecentFiles>
</File>
<Font>

View File

@ -32,7 +32,7 @@
<dependency>
<groupId>com.fifesoft</groupId>
<artifactId>rsyntaxtextarea</artifactId>
<version>2.6.0</version>
<version>3.0.4</version>
</dependency>
</dependencies>
<properties>

View File

@ -42,6 +42,8 @@ class NDArray(object):
return self._shape
def set_shape(self, value):
if isinstance(value, int):
value = tuple([value])
if -1 in value:
nvalue = list(value)
l = 1
@ -52,8 +54,7 @@ class NDArray(object):
nvalue[idx] = int(self._array.getSize() / l)
value = tuple(nvalue)
self._shape = value
nshape = jarray.array(value, 'i')
self.__init__(self._array.reshape(nshape))
self.__init__(self._array.reshape(value))
shape = property(get_shape, set_shape)