Skip to content

Commit

Permalink
update format
Browse files Browse the repository at this point in the history
  • Loading branch information
rbmonster committed Aug 30, 2022
1 parent d8d91af commit 850ed87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/other/OPERATING_SYSTEM.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ CPU时钟周期数可以进一步拆解成:`CPU时钟周期数 = 指令数 *
操作系统的特征:
1. 并发性:
- 并行性:指两个或多个事件在同一时刻发生。宏观上在一段时间内有多道程序同时运行,但单处理器其实是交替运行,故微观上是交替执行。
- 并发性:指两个或多个事件在同一事件间隔内发生。如哲学家思考和用餐是可以同时进行的,即两个任务并行执行。
- 并发性:指两个或多个事件在同一时间间隔内发生。如哲学家思考和用餐是可以同时进行的,即两个任务并行执行。
2. 共享性。资源共享是指系统中的硬件和软件不再为某个程序所独占,而是供多个用户共同使用的。
- 互斥共享:系统中可供共享的某些资源,一段时间内只能供一个作业使用。如打印机、队列等。
- 同时访问:系统中另一类资源如磁盘、可重入代码,可以供多个作业同时访问。
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/test/TestSort.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ public static void main(String[] args) {
System.out.println(Arrays.toString(array));
}

public static void heapsort(int[] nums) {
public static void heapsort(int[] nums) {
int len = nums.length;
for (int i = len/2 -1; i >= 0; i--) {
for (int i = len / 2 - 1; i >= 0; i--) {
adjustHeap(nums, i, len);
}
for (int j = len-1; j > 0; j--) {
for (int j = len - 1; j > 0; j--) {
swap(nums, 0, j);
adjustHeap(nums, 0, j);
}
}

private static void adjustHeap(int[] nums, int i, int len) {
int tmp = nums[i];
for (int j = 2*i+1; j < len; j = j*2+1) {
if (j+1<len && nums[j+1]> nums[j]) {
j = j+1;
for (int j = 2 * i+1; j < len; j = j * 2 + 1) {
if (j + 1 < len && nums[j + 1] > nums[j]) {
j = j + 1;
}
if (nums[j] > tmp) {
nums[i] = nums[j];
Expand Down

0 comments on commit 850ed87

Please sign in to comment.