Skip to content

Commit

Permalink
docs: change image url
Browse files Browse the repository at this point in the history
  • Loading branch information
guofei9987 committed May 2, 2020
1 parent 4413446 commit 2991626
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 41 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
##ignore this file##
/__pycache__/
/.idea/
__pycache__/
/.idea/
/build/
/dist/
/scikit_opt.egg-info/
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<table border="0" width="10%">
<tr>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/1.jpg?raw=true" height="80" width="82"></td>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/2.jpg?raw=true" height="80" width="82"></td>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/3.jpg?raw=true" height="80" width="82"></td>
<td><img src="https://img1.github.io/tmp/1.jpg" height="80" width="82"></td>
<td><img src="https://img1.github.io/tmp/2.jpg" height="80" width="82"></td>
<td><img src="https://img1.github.io/tmp/3.jpg" height="80" width="82"></td>
</tr>
<tr>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/4.jpg?raw=true" height="80" width="82"></td>
<td><img src="https://img1.github.io/tmp/4.jpg" height="80" width="82"></td>
<td><img src="https://img.shields.io/github/stars/guofei9987/scikit-opt.svg?style=social"></td>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/6.jpg?raw=true" height="82" width="82"></td>
<td><img src="https://img1.github.io/tmp/6.jpg" height="82" width="82"></td>
</tr>
<tr>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/7.jpg?raw=true" height="82" width="82"></td>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/8.jpg?raw=true" height="82" width="82"></td>
<td><img src="https://github.com/guofei9987/pictures_for_blog/blob/master/tmp/9.jpg?raw=true" height="82" width="82"></td>
<td><img src="https://img1.github.io/tmp/7.jpg" height="82" width="82"></td>
<td><img src="https://img1.github.io/tmp/8.jpg" height="82" width="82"></td>
<td><img src="https://img1.github.io/tmp/9.jpg" height="82" width="82"></td>
</tr>
</table>

Expand Down Expand Up @@ -238,7 +238,7 @@ Y_history.min(axis=1).cummin().plot(kind='line')
plt.show()
```

![Figure_1-1](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_1.png?raw=true)
![Figure_1-1](https://img1.github.io/heuristic_algorithm/ga_1.png)

### 2.2 Genetic Algorithm for TSP(Travelling Salesman Problem)
Just import the `GA_TSP`, it overloads the `crossover`, `mutation` to solve the TSP
Expand Down Expand Up @@ -289,7 +289,7 @@ ax[1].plot(ga_tsp.generation_best_Y)
plt.show()
```

![GA_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_tsp.png?raw=true)
![GA_TPS](https://img1.github.io/heuristic_algorithm/ga_tsp.png)


## 3. PSO(Particle swarm optimization)
Expand Down Expand Up @@ -327,10 +327,10 @@ plt.show()
```


![PSO_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.png?raw=true)
![PSO_TPS](https://img1.github.io/heuristic_algorithm/pso.png)


![pso_ani](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.gif?raw=true)
![pso_ani](https://img1.github.io/heuristic_algorithm/pso.gif)
**see [examples/demo_pso_ani.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_pso_ani.py)**

### 3.2 PSO without constraint
Expand Down Expand Up @@ -370,7 +370,7 @@ plt.plot(pd.DataFrame(sa.best_y_history).cummin(axis=0))
plt.show()

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa.png)


Moreover, scikit-opt provide 3 types of Simulated Annealing: Fast, Boltzmann, Cauchy. See [more sa](https://scikit-opt.github.io/scikit-opt/#/en/more_sa)
Expand Down Expand Up @@ -409,18 +409,18 @@ ax[1].set_ylabel("Latitude")
plt.show()

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp.png)


More: Plot the animation:

![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp1.gif?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp1.gif)
**see [examples/demo_sa_tsp.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_sa_tsp.py)**




## 5. ACA (Ant Colony Algorithm) for tsp
## 5. ACA (Ant Colony Algorithm) for tsp
-> Demo code: [examples/demo_aca_tsp.py#s2](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_aca_tsp.py#L17)
```python
from sko.ACA import ACA_TSP
Expand All @@ -433,7 +433,7 @@ best_x, best_y = aca.run()

```

![ACA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/aca_tsp.png?raw=true)
![ACA](https://img1.github.io/heuristic_algorithm/aca_tsp.png)


## 6. immune algorithm (IA)
Expand All @@ -449,7 +449,7 @@ print('best routine:', best_points, 'best_distance:', best_distance)

```

![IA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ia2.png?raw=true)
![IA](https://img1.github.io/heuristic_algorithm/ia2.png)

## 7. Artificial Fish Swarm Algorithm (AFSA)
-> Demo code: [examples/demo_afsa.py#s1](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_afsa.py#L1)
Expand Down
20 changes: 10 additions & 10 deletions docs/en/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Y_history.min(axis=1).cummin().plot(kind='line')
plt.show()
```

![Figure_1-1](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_1.png?raw=true)
![Figure_1-1](https://img1.github.io/heuristic_algorithm/ga_1.png)

### 2.2 Genetic Algorithm for TSP(Travelling Salesman Problem)
Just import the `GA_TSP`, it overloads the `crossover`, `mutation` to solve the TSP
Expand Down Expand Up @@ -269,7 +269,7 @@ ax[1].plot(ga_tsp.generation_best_Y)
plt.show()
```

![GA_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_tsp.png?raw=true)
![GA_TPS](https://img1.github.io/heuristic_algorithm/ga_tsp.png)


## 3. PSO(Particle swarm optimization)
Expand Down Expand Up @@ -307,10 +307,10 @@ plt.show()
```


![PSO_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.png?raw=true)
![PSO_TPS](https://img1.github.io/heuristic_algorithm/pso.png)


![pso_ani](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.gif?raw=true)
![pso_ani](https://img1.github.io/heuristic_algorithm/pso.gif)
**see [examples/demo_pso_ani.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_pso_ani.py)**

### 3.2 PSO without constraint
Expand Down Expand Up @@ -350,7 +350,7 @@ plt.plot(pd.DataFrame(sa.best_y_history).cummin(axis=0))
plt.show()

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa.png)


Moreover, scikit-opt provide 3 types of Simulated Annealing: Fast, Boltzmann, Cauchy. See [more sa](https://scikit-opt.github.io/scikit-opt/#/en/more_sa)
Expand Down Expand Up @@ -389,18 +389,18 @@ ax[1].set_ylabel("Latitude")
plt.show()

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp.png)


More: Plot the animation:

![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp1.gif?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp1.gif)
**see [examples/demo_sa_tsp.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_sa_tsp.py)**




## 5. ACA (Ant Colony Algorithm) for tsp
## 5. ACA (Ant Colony Algorithm) for tsp
-> Demo code: [examples/demo_aca_tsp.py#s2](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_aca_tsp.py#L17)
```python
from sko.ACA import ACA_TSP
Expand All @@ -413,7 +413,7 @@ best_x, best_y = aca.run()

```

![ACA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/aca_tsp.png?raw=true)
![ACA](https://img1.github.io/heuristic_algorithm/aca_tsp.png)


## 6. immune algorithm (IA)
Expand All @@ -429,7 +429,7 @@ print('best routine:', best_points, 'best_distance:', best_distance)

```

![IA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ia2.png?raw=true)
![IA](https://img1.github.io/heuristic_algorithm/ia2.png)

## 7. Artificial Fish Swarm Algorithm (AFSA)
-> Demo code: [examples/demo_afsa.py#s1](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_afsa.py#L1)
Expand Down
21 changes: 10 additions & 11 deletions docs/zh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ga.register(operator_name='ranking', operator=ranking.ranking). \
register(operator_name='crossover', operator=crossover.crossover_2point). \
register(operator_name='mutation', operator=mutation.mutation)
```
做遗传算法运算
做遗传算法运算
-> Demo code: [examples/demo_ga_udf.py#s5](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_ga_udf.py#L28)
```python
best_x, best_y = ga.run()
Expand Down Expand Up @@ -204,7 +204,7 @@ Y_history.min(axis=1).cummin().plot(kind='line')
plt.show()
```

![Figure_1-1](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_1.png?raw=true)
![Figure_1-1](https://img1.github.io/heuristic_algorithm/ga_1.png)

### 2.2 遗传算法用于旅行商问题
`GA_TSP` 针对TSP问题重载了 `交叉(crossover)``变异(mutation)` 两个算子
Expand Down Expand Up @@ -256,7 +256,7 @@ ax[1].plot(ga_tsp.generation_best_Y)
plt.show()
```

![GA_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ga_tsp.png?raw=true)
![GA_TPS](https://img1.github.io/heuristic_algorithm/ga_tsp.png)


## 3. 粒子群算法
Expand Down Expand Up @@ -292,9 +292,9 @@ plt.show()

```

![PSO_TPS](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.png?raw=true)
![PSO_TPS](https://img1.github.io/heuristic_algorithm/pso.png)

![pso_ani](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/pso.gif?raw=true)
![pso_ani](https://img1.github.io/heuristic_algorithm/pso.gif)
**see [examples/demo_pso.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_pso_ani.py)**


Expand Down Expand Up @@ -326,7 +326,7 @@ best_x, best_y = sa.run()
print('best_x:', best_x, 'best_y', best_y)

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa.png)

**第三步**,画出结果
-> Demo code: [examples/demo_sa.py#s3](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_sa.py#L10)
Expand Down Expand Up @@ -377,10 +377,10 @@ ax[1].set_ylabel("Latitude")
plt.show()

```
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp.png?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp.png)

咱还有个动画
![sa](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/sa_tsp1.gif?raw=true)
![sa](https://img1.github.io/heuristic_algorithm/sa_tsp1.gif)
**参考代码 [examples/demo_sa_tsp.py](https://github.com/guofei9987/scikit-opt/blob/master/examples/demo_sa_tsp.py)**

## 5. 蚁群算法
Expand All @@ -398,7 +398,7 @@ best_x, best_y = aca.run()

```

![ACA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/aca_tsp.png?raw=true)
![ACA](https://img1.github.io/heuristic_algorithm/aca_tsp.png)



Expand All @@ -417,7 +417,7 @@ print('best routine:', best_points, 'best_distance:', best_distance)

```

![IA](https://github.com/guofei9987/pictures_for_blog/blob/master/heuristic_algorithm/ia2.png?raw=true)
![IA](https://img1.github.io/heuristic_algorithm/ia2.png)


## 7. 人工鱼群算法
Expand All @@ -438,4 +438,3 @@ afsa = AFSA(func, n_dim=2, size_pop=50, max_iter=300,
best_x, best_y = afsa.run()
print(best_x, best_y)
```

0 comments on commit 2991626

Please sign in to comment.