diff --git a/src/main/scala/practise1/comprehensive/Comprehensive.scala b/src/main/scala/practise1/comprehensive/Comprehensive.scala index 1887a75..be16e8a 100644 --- a/src/main/scala/practise1/comprehensive/Comprehensive.scala +++ b/src/main/scala/practise1/comprehensive/Comprehensive.scala @@ -19,16 +19,16 @@ object Comprehensive { val score = 85 val evaluate = - if (score >= 90 ) "优秀" - else if (score >= 80) "良好" - else if (score >= 60) "及格" - else "不及格" + if (score >= 90) "优秀" + else if (score >= 80) "良好" + else if (score >= 60) "及格" + else "不及格" println( s""" - |${name},今年${age}岁 - |成绩:${score} - |评价:${evaluate}""".stripMargin) + |${name},今年${age}岁 + |成绩:${score} + |评价:${evaluate}""".stripMargin) } } diff --git a/src/main/scala/practise1/demo/Demo1VarAndVal.scala b/src/main/scala/practise1/demo/Demo1VarAndVal.scala index 20f5dbe..3f3ad2f 100644 --- a/src/main/scala/practise1/demo/Demo1VarAndVal.scala +++ b/src/main/scala/practise1/demo/Demo1VarAndVal.scala @@ -8,14 +8,13 @@ object Demo1VarAndVal { // name = "Tom" // ❌ 不允许修改 var age = 25 - age = 26 // ✅ 可以修改 + age = 26 // ✅ 可以修改 println(name) println(age) println("=================================") - println("=================================") } diff --git a/src/main/scala/practise1/demo/Demo2Type.scala b/src/main/scala/practise1/demo/Demo2Type.scala index c81edd8..73bcd15 100644 --- a/src/main/scala/practise1/demo/Demo2Type.scala +++ b/src/main/scala/practise1/demo/Demo2Type.scala @@ -6,10 +6,10 @@ object Demo2Type { // //Scala 支持自动推断类型: - val name = "xiaoMing" // String - val age = 25 // Int - val price = 19.99 // Double - val flag = true // Boolean + val name = "xiaoMing" // String + val age = 25 // Int + val price = 19.99 // Double + val flag = true // Boolean // 也可以明确指定: val name2: String = "xiaoMing" diff --git a/src/main/scala/practise1/demo/Demo3StringInterpolation.scala b/src/main/scala/practise1/demo/Demo3StringInterpolation.scala index dfc5900..c6fa2f7 100644 --- a/src/main/scala/practise1/demo/Demo3StringInterpolation.scala +++ b/src/main/scala/practise1/demo/Demo3StringInterpolation.scala @@ -1,5 +1,6 @@ package practise1.demo + object Demo3StringInterpolation { // 这是 Scala 很常用的语法: diff --git a/src/main/scala/practise1/demo/Demo4If.scala b/src/main/scala/practise1/demo/Demo4If.scala index 0372ebd..fc732d9 100644 --- a/src/main/scala/practise1/demo/Demo4If.scala +++ b/src/main/scala/practise1/demo/Demo4If.scala @@ -6,18 +6,18 @@ object Demo4If { // Scala 的 if 和 Java 类似 val age = 20 - if(age >=18){ + if (age >= 18) { println("成年人") - }else{ + } else { println("未成年") } // 但是 Scala 有一个非常重要的特点:if 本身就是一个表达式,可以返回值 - val result = if(age >= 18){ + val result = if (age >= 18) { "成年人" - }else{ + } else { "未成年人" } diff --git a/src/main/scala/practise1/exercises/Exercises1.scala b/src/main/scala/practise1/exercises/Exercises1.scala index a710485..b3a771a 100644 --- a/src/main/scala/practise1/exercises/Exercises1.scala +++ b/src/main/scala/practise1/exercises/Exercises1.scala @@ -2,15 +2,15 @@ package practise1.exercises object Exercises1 { def main(args: Array[String]): Unit = { -/* 练习 1:基本变量 + /* 练习 1:基本变量 - 创建三个变量: - name = "Tom" - age = 20 - salary = 15000.5 + 创建三个变量: + name = "Tom" + age = 20 + salary = 15000.5 - 要求: - 输出:Tom今年20岁,工资是15000.5*/ + 要求: + 输出:Tom今年20岁,工资是15000.5*/ val name = "Tom" val age = 20 diff --git a/src/main/scala/practise1/exercises/Exercises2.scala b/src/main/scala/practise1/exercises/Exercises2.scala index 98a4e59..e34dede 100644 --- a/src/main/scala/practise1/exercises/Exercises2.scala +++ b/src/main/scala/practise1/exercises/Exercises2.scala @@ -1,5 +1,6 @@ package practise1.exercises + object Exercises2 { def main(args: Array[String]): Unit = { /* 练习 2:判断年龄 diff --git a/src/main/scala/practise1/exercises/Exercises3.scala b/src/main/scala/practise1/exercises/Exercises3.scala index 85f4cfb..1095106 100644 --- a/src/main/scala/practise1/exercises/Exercises3.scala +++ b/src/main/scala/practise1/exercises/Exercises3.scala @@ -1,5 +1,6 @@ package practise1.exercises + object Exercises3 { def main(args: Array[String]): Unit = { /* 练习 3:计算两个数 diff --git a/src/main/scala/practise1/exercises/Exercises4.scala b/src/main/scala/practise1/exercises/Exercises4.scala index 96d3482..d6a19c9 100644 --- a/src/main/scala/practise1/exercises/Exercises4.scala +++ b/src/main/scala/practise1/exercises/Exercises4.scala @@ -1,5 +1,6 @@ package practise1.exercises + import scala.util.Random object Exercises4 {